* update the en_GB.po file with the newest translations

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

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index d376371..9e543db 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -242,17 +242,11 @@ restore_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
        gchar *key;
        int percent, pos;
        
-       key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS);
+       key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS); 
+       percent = modest_conf_get_int (conf, key, NULL);
        
-       if (modest_conf_key_exists (conf, key, NULL)) {
-               percent = modest_conf_get_int (conf, key, NULL);
-               
-               pos = GTK_WIDGET (paned)->allocation.width * percent /100;
-               gtk_paned_set_position (paned, pos);
-       } else {
-               /* The initial position must follow the 30/70 rule */
-               gtk_paned_set_position (paned, GTK_WIDGET(paned)->requisition.width/3);
-       }
+       pos = GTK_WIDGET (paned)->allocation.width * percent /100;
+       gtk_paned_set_position (paned, pos);
 
        g_free (key);
        return TRUE;
@@ -283,6 +277,9 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        }
        
        type  = modest_tny_folder_guess_folder_type (folder);
+       if (type == TNY_FOLDER_TYPE_INVALID)
+               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+       
        style = modest_header_view_get_style   (header_view);
        
        key = _modest_widget_memory_get_keyname_with_double_type (name, type, style,
@@ -371,6 +368,9 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
                return TRUE; /* no folder: no settings */
        
        type = modest_tny_folder_guess_folder_type (folder);    
+       if (type == TNY_FOLDER_TYPE_INVALID)
+               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+
        style = modest_header_view_get_style (header_view);
 
        key = _modest_widget_memory_get_keyname_with_double_type (name, type, style,