* Fixed two reference leaks

* Removed an unneeded camel_shutdown

pmo-trunk-r4735

diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c
index 6698fc3..3c6f673 100644 (file)
--- a/src/maemo/modest-account-view-window.c
+++ b/src/maemo/modest-account-view-window.c
@@ -312,6 +312,7 @@ on_account_settings_dialog_response (GtkDialog *dialog,
 
        /* Free */
        g_free (account_name);
 
        /* Free */
        g_free (account_name);

+       g_object_unref (store_account);

 }
 
 static void
 }
 
 static void

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index acee4be..3f3cc66 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -312,9 +312,6 @@ account_verify_last_ref (TnyAccount *account, const gchar *str)
        g_free (txt);
 }
 
        g_free (txt);
 }
 

-
-
-

 static void
 foreach_account_append_to_list (gpointer data, 
                                gpointer user_data)
 static void
 foreach_account_append_to_list (gpointer data, 
                                gpointer user_data)

@@ -836,8 +833,6 @@ modest_tny_account_store_finalize (GObject *obj)
                priv->session = NULL;
        }
 
                priv->session = NULL;
        }
 

-       camel_shutdown ();
-

        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index bf23b8f..3ad5acc 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -2210,8 +2210,10 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view,
                        GtkWidget *folder_view = 
                                modest_main_window_get_child_widget (main_window,
                                                                     MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
                        GtkWidget *folder_view = 
                                modest_main_window_get_child_widget (main_window,
                                                                     MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);

-                       if (folder != NULL) 
+                       if (folder != NULL) {

                                modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), folder, FALSE);
                                modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), folder, FALSE);

+                               g_object_unref (folder);
+                       }

                        gtk_widget_grab_focus (GTK_WIDGET (folder_view));
                        return;
                }
                        gtk_widget_grab_focus (GTK_WIDGET (folder_view));
                        return;
                }