* Some more changes

[modest] / src / maemo / modest-main-window.c

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 7fc0726..8f7f969 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -103,7 +103,7 @@ static void         on_queue_changed                     (ModestMailOperationQue
 
 static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
 
-static void on_account_update                 (TnyAccountStore *account_store, 
+static void account_number_changed                 (TnyAccountStore *account_store, 
                                               const gchar *account_name,
                                               gpointer user_data);
 
@@ -690,7 +690,10 @@ connect_signals (ModestMainWindow *self)
 
        /* Track account changes. We need to refresh the toolbar */
        g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
-                         "account_update", G_CALLBACK (on_account_update),
+                         "account_inserted", G_CALLBACK (account_number_changed),
+                         self);
+       g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
+                         "account_removed", G_CALLBACK (account_number_changed),
                          self);
 
        /* Account store */
@@ -1194,7 +1197,7 @@ modest_main_window_show_toolbar (ModestWindow *self,
                gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);
 
                /* Set send & receive button tap and hold menu */
-               on_account_update (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
+               account_number_changed (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
                                   NULL, self);
        }
 
@@ -1218,9 +1221,9 @@ compare_display_names (ModestAccountData *a,
 }
 
 static void 
-on_account_update (TnyAccountStore *account_store, 
-                  const gchar *account_name,
-                  gpointer user_data)
+account_number_changed (TnyAccountStore *account_store, 
+                       const gchar *account_name,
+                       gpointer user_data)
 {
        GSList *account_names, *iter, *accounts;
        ModestMainWindow *self;
@@ -1432,7 +1435,7 @@ on_account_update (TnyAccountStore *account_store,
        for (i = 0; i < num_accounts; i++) {
                ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
 
-               if(account_data->account_name &&
+               if(account_data->account_name && default_account &&
                   strcmp (account_data->account_name, default_account) == 0) {
                        gchar *item_name = g_strconcat (account_data->account_name, "Menu", NULL);