Fixes NB#116869, adding extra padding at the top of the main views

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

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index b748c30..398342d 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -571,20 +571,10 @@ format_compact_style (gchar **item_name,
                /* Remove mailbox prefix if any */
                gchar *prefix = g_strconcat (mailbox, MODEST_FOLDER_PATH_SEPARATOR, NULL);
                if (g_str_has_prefix (*item_name, prefix)) {
-                       gchar *new_item_name;
-
-                       new_item_name = g_strdup (*item_name + strlen (prefix));
-                       if (!g_ascii_strcasecmp (new_item_name, "Inbox")) {
-                               g_free (new_item_name);
-                               new_item_name = g_strdup (_("mcen_me_folder_inbox"));
-                       }
+                       gchar *new_item_name = g_strdup (*item_name + strlen (prefix));
                        g_free (*item_name);
                        *item_name = new_item_name;
                }
-       } else if (!g_ascii_strcasecmp (*item_name, "Inbox")) {
-
-               g_free (*item_name);
-               *item_name = g_strdup (_("mcen_me_folder_inbox"));
        }
 
        if (!is_special || multiaccount) {
@@ -729,6 +719,13 @@ text_cell_data  (GtkTreeViewColumn *column,
                }
        }
 
+       /* Convert INBOX */
+       if (type == TNY_FOLDER_TYPE_INBOX &&
+           !g_ascii_strcasecmp (fname, "Inbox")) {
+               g_free (item_name);
+               item_name = g_strdup (_("mcen_me_folder_inbox"));
+       }
+
        if (!item_name)
                item_name = g_strdup ("unknown");
 
@@ -1345,17 +1342,27 @@ tny_account_store_view_init (gpointer g, gpointer iface_data)
        klass->set_account_store = modest_folder_view_set_account_store;
 }
 
+static gboolean
+match_all (TnyList *list, GObject *item, gpointer match_data)
+{
+       return TRUE;
+}
+
 static void
 modest_folder_view_dispose (GObject *obj)
 {
        static gboolean disposed = FALSE;
        ModestFolderViewPrivate *priv;
+       GtkTreeModel *model;
 
        if (disposed)
                return;
 
        priv =  MODEST_FOLDER_VIEW_GET_PRIVATE (obj);
 
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (obj));
+       tny_list_remove_matches (TNY_LIST (model), match_all, NULL);
+
 #ifdef MODEST_TOOLKIT_HILDON2
        modest_signal_mgr_disconnect_all_and_destroy (priv->signal_handlers);
 #endif
@@ -3894,10 +3901,10 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src,
        /* Set copied model */
        gtk_tree_view_set_model (GTK_TREE_VIEW (folder_view_dst), new_filter_model);
 #ifndef MODEST_TOOLKIT_HILDON2
-       priv->signal_handlers = modest_signal_mgr_connect (priv->signal_handlers,
-                                                          G_OBJECT(new_filter_model), "row-inserted",
-                                                          (GCallback) on_row_inserted_maybe_select_folder,
-                                                          folder_view_dst);
+       dst_priv->signal_handlers = modest_signal_mgr_connect (dst_priv->signal_handlers,
+                                                              G_OBJECT(new_filter_model), "row-inserted",
+                                                              (GCallback) on_row_inserted_maybe_select_folder,
+                                                              folder_view_dst);
 #endif
 #ifdef MODEST_TOOLKIT_HILDON2
        if (new_tny_model) {