* Added modest_platform_create_folder_view

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

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 794f7e8..1920953 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -33,6 +33,7 @@
 #include <modest-account-mgr-helpers.h>
 #include <modest-tny-platform-factory.h>
 #include <modest-tny-folder.h>
+#include <modest-init.h>
 #include <widgets/modest-header-view.h>
 #include <widgets/modest-msg-view.h>
 #include <widgets/modest-folder-view.h>
@@ -275,6 +276,11 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
                                                                  MODEST_WIDGET_MEMORY_PARAM_COLUMN_WIDTH);
 
        cursor = cols = modest_header_view_get_columns (header_view);
+       if (!cols) {
+               g_warning ("DEBUG: %s: modest_header_view_get_columns() returned NULL.",
+                        __FUNCTION__);
+       }
+       
        str = g_string_new (NULL);
 
        /* NOTE: the exact details of this format are important, as they
@@ -299,7 +305,13 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
                cursor = g_list_next (cursor);
        }
 
-       modest_conf_set_string (conf, key, str->str, NULL);
+       if ((str->str == NULL) || (strlen(str->str) == 0)) {
+               /* TODO: Find out why this happens sometimes. */
+               g_warning ("DEBUG: %s: Attempting to write an empty value to "
+                       "gconf key %s. Preventing.", __FUNCTION__, key);
+       }
+       else
+               modest_conf_set_string (conf, key, str->str, NULL);
 
        g_free (key);   
        g_string_free (str, TRUE);
@@ -347,6 +359,18 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
                }
                g_free (data);  
                
+               /* Use defaults if gconf has no, or empty information: */
+               /* We don't know why the value is empty sometimes. */
+               if (g_list_length(cols) == 0) {
+                       g_warning("%s: gconf key %s was empty. Using default column IDs.\n", 
+                               __FUNCTION__, key);
+                       g_list_free (cols);
+                       cols = NULL;
+               }
+               
+               if (!cols)
+                       cols = modest_init_get_default_header_view_column_ids (type, style);
+               
                if (cols) {
                        GList *viewcolumns, *colcursor, *widthcursor, *sortablecursor;
                        modest_header_view_set_columns (header_view, cols, type);