* Added wpeditor dependency to configure.ac

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

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 962e352..323bf6d 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -229,10 +229,10 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        TnyFolder *folder;
        TnyFolderType type;
        ModestHeaderViewStyle style;
-       
+
        folder = modest_header_view_get_folder (header_view);
-       if (!folder) 
-               return TRUE; /* no folder: no settings */ 
+       if (!folder || modest_header_view_is_empty (header_view))
+               return TRUE; /* no non-empty folder: no settings */
        
        type  = modest_tny_folder_guess_folder_type (folder);
        style = modest_header_view_get_style   (header_view);
@@ -256,8 +256,7 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
                                                            MODEST_HEADER_VIEW_COLUMN));
                width = gtk_tree_view_column_get_width (col);
                
-               g_string_append_printf (str, "%d:%d ", col_id, width);  
-               
+               g_string_append_printf (str, "%d:%d ", col_id, width);
                cursor = g_list_next (cursor);
        }
 
@@ -266,6 +265,7 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        g_free (key);   
        g_string_free (str, TRUE);
        g_list_free (cols);
+       g_object_unref (G_OBJECT (folder));
        
        return TRUE;
 }
@@ -281,8 +281,8 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        ModestHeaderViewStyle style;
 
        folder = modest_header_view_get_folder (header_view);
-       if (!folder) 
-               return TRUE; /* no folder: no settings */ 
+       if (!folder || modest_header_view_is_empty (header_view))
+               return TRUE; /* no non-empty folder: no settings */
        
        type = modest_tny_folder_guess_folder_type (folder);
        style = modest_header_view_get_style   (header_view);
@@ -325,6 +325,8 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        }
 
        g_free (key);
+       g_object_unref (G_OBJECT (folder));
+
        return TRUE;
 }