* modest-header-view-*

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

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 9af2603..a838a26 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);
@@ -240,7 +240,6 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        key = _modest_widget_memory_get_keyname_with_double_type (name, type, style,
                                                                  MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH);
 
-       g_warning ("saving %s", key);   
        cursor = cols = modest_header_view_get_columns (header_view);
        str = g_string_new (NULL);
 
@@ -290,9 +289,6 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
 
        key = _modest_widget_memory_get_keyname_with_double_type (name, type, style,
                                                                  MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH);
-       
-       g_warning ("restoring %s", key);        
-       
        if (modest_conf_key_exists (conf, key, NULL)) {
                
                gchar *data, *cursor;