Removed extra references when deleting folders

[modest] / src / widgets / modest-folder-view.c

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index f278b8b..770fb2a 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -737,7 +737,7 @@ text_cell_data  (GtkTreeViewColumn *column,
 
        /* Convert INBOX */
        if (type == TNY_FOLDER_TYPE_INBOX &&
 
        /* Convert INBOX */
        if (type == TNY_FOLDER_TYPE_INBOX &&

-           !g_ascii_strcasecmp (fname, "Inbox")) {
+           g_str_has_suffix (fname, "Inbox")) {

                g_free (item_name);
                item_name = g_strdup (_("mcen_me_folder_inbox"));
        }
                g_free (item_name);
                item_name = g_strdup (_("mcen_me_folder_inbox"));
        }

@@ -2374,7 +2374,7 @@ modest_folder_view_update_model (ModestFolderView *self,
                                                self,
                                                NULL);
 
                                                self,
                                                NULL);
 

-       GtkTreeModel *old_tny_model;
+       GtkTreeModel *old_tny_model = NULL;

        if (get_inner_models (self, NULL, NULL, &old_tny_model)) {
                if (priv->signal_handlers > 0) {
                        priv->signal_handlers = modest_signal_mgr_disconnect (priv->signal_handlers,
        if (get_inner_models (self, NULL, NULL, &old_tny_model)) {
                if (priv->signal_handlers > 0) {
                        priv->signal_handlers = modest_signal_mgr_disconnect (priv->signal_handlers,

@@ -2394,7 +2394,7 @@ modest_folder_view_update_model (ModestFolderView *self,
        priv->signal_handlers = modest_signal_mgr_connect (priv->signal_handlers,
                                                           G_OBJECT (model),
                                                           "activity-changed",
        priv->signal_handlers = modest_signal_mgr_connect (priv->signal_handlers,
                                                           G_OBJECT (model),
                                                           "activity-changed",

-                                                          G_CALLBACK (on_activity_changed), 
+                                                          G_CALLBACK (on_activity_changed),

                                                           self);
 #endif
 
                                                           self);
 #endif