* small cleanups

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

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index f564049..3dacf35 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -30,6 +30,7 @@
 #include "modest-widget-memory.h"
 
 #include <modest-tny-platform-factory.h>
+#include <modest-tny-folder.h>
 #include <widgets/modest-header-view.h>
 #include <widgets/modest-msg-view.h>
 #include <widgets/modest-folder-view.h>
@@ -47,7 +48,7 @@ static gchar*
 get_keyname (ModestConf *conf, const gchar *name, const gchar *param)
 {
        gchar *esc_name, *keyname;
-       esc_name = modest_conf_key_escape (conf, name);
+       esc_name = modest_conf_key_escape (name);
 
        keyname = g_strdup_printf ("%s/%s/%s",
                                   MODEST_CONF_WIDGET_NAMESPACE, 
@@ -61,7 +62,7 @@ static gchar*
 get_keyname_with_type (ModestConf *conf, const gchar *name, guint type, const gchar *param)
 {
        gchar *esc_name, *keyname;
-       esc_name = modest_conf_key_escape (conf, name);
+       esc_name = modest_conf_key_escape (name);
 
        keyname = g_strdup_printf ("%s/%s/%s_%d",
                                   MODEST_CONF_WIDGET_NAMESPACE, 
@@ -205,11 +206,15 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        TnyFolder *folder;
        TnyFolderType type;
 
+       if (modest_header_view_get_state (header_view) &
+           MODEST_HEADER_VIEW_STATE_IS_EMPTY)
+               return TRUE; /* don't save the settings in the empty case */
+
        folder = modest_header_view_get_folder (header_view);
        if (!folder) 
                return TRUE; /* no folder: no settings */ 
        
-       type = modest_folder_view_guess_folder_type (folder);
+       type = modest_tny_folder_guess_folder_type (folder);
        key = get_keyname_with_type (conf, name, type, PARAM_COLUMN_WIDTH);
 
        cursor = cols = modest_header_view_get_columns (header_view);
@@ -252,7 +257,7 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        if (!folder) 
                return TRUE; /* no folder: no settings */ 
        
-       type = modest_folder_view_guess_folder_type (folder);
+       type = modest_tny_folder_guess_folder_type (folder);
        
        key = get_keyname_with_type (conf, name, type, PARAM_COLUMN_WIDTH);
        if (modest_conf_key_exists (conf, key, NULL)) {