* Fixed an error in the g_signal_emit of my last commit

	* Fixed some leaks

pmo-trunk-r3416

diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c
index 24c4f2f..63d939b 100644 (file)
--- a/src/modest-account-mgr.c
+++ b/src/modest-account-mgr.c
@@ -1404,7 +1404,8 @@ compare_account_name(gconstpointer a, gconstpointer b)
 }
 
 void 
-modest_account_mgr_set_account_busy(ModestAccountMgr* self, const gchar* account_name, 
+modest_account_mgr_set_account_busy(ModestAccountMgr* self, 
+                                   const gchar* account_name, 
                                    gboolean busy)
 {
        ModestAccountMgrPrivate* priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self);
@@ -1416,7 +1417,8 @@ modest_account_mgr_set_account_busy(ModestAccountMgr* self, const gchar* account
 
                if (account && !modest_account_mgr_account_is_busy(self, account_name)) {
                        priv->busy_accounts = g_slist_append(priv->busy_accounts, g_strdup(account_name));
-                       g_signal_emit (G_OBJECT(self), ACCOUNT_BUSY_SIGNAL, 0, account_name, TRUE);
+                       g_signal_emit (G_OBJECT(self), signals[ACCOUNT_BUSY_SIGNAL], 
+                                      0, account_name, TRUE);
                }
                modest_account_mgr_free_account_names (account_names);
                account_names = NULL;
@@ -1427,7 +1429,8 @@ modest_account_mgr_set_account_busy(ModestAccountMgr* self, const gchar* account
                if (account) {
                        g_free(account->data);
                        priv->busy_accounts = g_slist_delete_link(priv->busy_accounts, account);
-                       g_signal_emit (G_OBJECT(self), ACCOUNT_BUSY_SIGNAL, 0, account_name, FALSE);
+                       g_signal_emit (G_OBJECT(self), signals[ACCOUNT_BUSY_SIGNAL], 
+                                      0, account_name, FALSE);
                }
        }
 }

diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c
index a9d8836..f50d502 100644 (file)
--- a/src/widgets/modest-account-view.c
+++ b/src/widgets/modest-account-view.c
@@ -245,30 +245,35 @@ on_account_busy_changed(ModestAccountMgr *account_mgr,
 {
        GtkListStore *model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(self)));
        GtkTreeIter iter;
-       g_message(__FUNCTION__);
+       gboolean found = FALSE;
+
        if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter))
                return;
-       do
-       {
+
+       do {
                gchar* cur_name;
-               gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, MODEST_ACCOUNT_VIEW_NAME_COLUMN, 
-                                                                                        &cur_name, -1);
-               if (g_str_equal(cur_name, account_name))
-               {
+               gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 
+                                  MODEST_ACCOUNT_VIEW_NAME_COLUMN, 
+                                  &cur_name, -1);
+
+               if (g_str_equal(cur_name, account_name)) {
                        ModestAccountData* account_data = 
                                modest_account_mgr_get_account_data (account_mgr, account_name);
-                       if (!account_data)
+                       if (!account_data) {
+                               g_free (cur_name);
                                return;
+                       }
                        gchar* last_updated_string = get_last_updated_string(account_mgr, account_data);
                        gtk_list_store_set(model, &iter, 
                                           MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string,
                                           -1);
                        g_free (last_updated_string);
                        modest_account_mgr_free_account_data (account_mgr, account_data);
-                       return;
+                       found = TRUE;
                }
-       }
-       while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter));
+               g_free (cur_name);
+
+       } while (!found && gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter));
 }
 
 static void