* check for a valid foldername

[modest] / src / modest-widget-memory.c

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 22c8da2..59085d6 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -221,11 +221,15 @@ save_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
        gchar *key;
        int pos;
 
-       pos = gtk_paned_get_position (paned);
-       
-       key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS);
-       modest_conf_set_int (conf, key, pos, NULL);
-       g_free (key);
+       /* Don't save the paned position if it's not visible, 
+        * because it could not be correct: */
+       if (GTK_WIDGET_VISIBLE (GTK_WIDGET (paned)) && GTK_WIDGET_REALIZED (GTK_WIDGET (paned))) {
+               pos = gtk_paned_get_position (paned);
+               
+               key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS);
+               modest_conf_set_int (conf, key, pos, NULL);
+               g_free (key);
+       }
        
        return TRUE;
 }
@@ -241,6 +245,16 @@ restore_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
        
        if (modest_conf_key_exists (conf, key, NULL)) {
                pos = modest_conf_get_int (conf, key, NULL);
+               
+               /* TODO: Remove this hack so that paned positions can really be used.
+                * The paned position is incorrectly saved somehow before its even visible,
+                * when we show the main window only some time after creating it,
+                * so this prevents a wrong value from being used. */
+               const gint max = (GTK_WIDGET(paned)->requisition.width)/3;
+               if (pos > max)
+                       pos = max;
+               
+                       
                gtk_paned_set_position (paned, pos);
        } else {
                /* The initial position must follow the 30/70 rule */
@@ -269,8 +283,11 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        gint sort_flag_id = 0;
        
        folder = modest_header_view_get_folder (header_view);
-       if (!folder || modest_header_view_is_empty (header_view))
+       if (!folder || modest_header_view_is_empty (header_view)) {
+               if (folder)
+                       g_object_unref (folder);
                return TRUE; /* no non-empty folder: no settings */
+       }
        
        type  = modest_tny_folder_guess_folder_type (folder);
        style = modest_header_view_get_style   (header_view);
@@ -332,7 +349,8 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
 
 
 
-       g_free (key);   
+       g_free (key);
+       g_free (sort_key);      
        g_string_free (str, TRUE);
        g_list_free (cols);
        g_object_unref (G_OBJECT (folder));
@@ -356,15 +374,16 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        gint sort_colid = -1, sort_type;
        
        folder = modest_header_view_get_folder (header_view);
-       if (!folder || modest_header_view_is_empty (header_view))
-               return TRUE; /* no non-empty folder: no settings */
+       if (!folder)
+               return TRUE; /* no folder: no settings */
        
-       type = modest_tny_folder_guess_folder_type (folder);    style = modest_header_view_get_style   (header_view);
+       type = modest_tny_folder_guess_folder_type (folder);    
+       style = modest_header_view_get_style (header_view);
 
        key = _modest_widget_memory_get_keyname_with_double_type (name, type, style,
                                                                  MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH);
        sort_key = _modest_widget_memory_get_keyname_with_double_type (name, type, style,
-                                                                 MODEST_WIDGET_MEMORY_PARAM_COLUMN_SORT);
+                                                                      MODEST_WIDGET_MEMORY_PARAM_COLUMN_SORT);
 
        if (modest_conf_key_exists (conf, sort_key, NULL)) {
                gchar *value = modest_conf_get_string (conf, sort_key, NULL);
@@ -433,7 +452,9 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        }
 
        if (sort_colid >= 0) {
-               GtkTreeModel *sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+         GtkTreeModel *sortable = 
+                 gtk_tree_model_filter_get_model (
+                         GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))));
                if (sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN)
                        modest_header_view_sort_by_column_id (header_view, 0, sort_type);
                gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
@@ -444,6 +465,8 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        }
 
        g_free (key);
+       g_free (sort_key);
+       
        g_object_unref (G_OBJECT (folder));
 
        return TRUE;
@@ -564,7 +587,7 @@ modest_widget_memory_restore (ModestConf *conf, GObject *widget, const gchar *na
        g_return_val_if_fail (conf, FALSE);
        g_return_val_if_fail (widget, FALSE);
        g_return_val_if_fail (name, FALSE);
-       
+
        if (GTK_IS_WINDOW(widget))
                return restore_settings_window (conf, GTK_WINDOW(widget), name);
        else if (GTK_IS_PANED(widget))