* Fixes NB#91689. fixes a wrong check for ASCII

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

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 050d406..1409a97 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -194,7 +194,7 @@ restore_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name)
           gtk_window_set_default_size() makes "drag-motion" signal
           report bad coordinates, so drag-and-drop do not work
           properly */
-#ifdef MODEST_PLATFORM_GNOME
+#ifdef MODEST_TOOLKIT_GTK
        if (height && width)
                gtk_window_set_default_size (win, width, height);
 #endif
@@ -219,16 +219,17 @@ static gboolean
 save_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
 {
        gchar *key;
-       int pos, percent;
+       gint pos;
+       gdouble percent;
 
        /* Don't save the paned position if it's not visible, 
         * because it could not be correct: */
-       if (GTK_WIDGET_VISIBLE (GTK_WIDGET (paned)) && GTK_WIDGET_REALIZED (GTK_WIDGET (paned))) {
+       if (GTK_WIDGET_REALIZED (GTK_WIDGET (paned))) {
                pos = gtk_paned_get_position (paned);
-               percent = pos * 100 / GTK_WIDGET (paned)->allocation.width;
+               percent = (gdouble) (pos * 100) / (gdouble) GTK_WIDGET (paned)->allocation.width;
 
                key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS);
-               modest_conf_set_int (conf, key, percent, NULL);
+               modest_conf_set_float (conf, key, percent, NULL);
                g_free (key);
        }
        
@@ -240,10 +241,11 @@ static gboolean
 restore_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
 {
        gchar *key;
-       int percent, pos;
+       gdouble percent;
+       gint pos;
        
        key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS); 
-       percent = modest_conf_get_int (conf, key, NULL);
+       percent = modest_conf_get_float (conf, key, NULL);
        
        if (GTK_WIDGET_VISIBLE (GTK_WIDGET (paned)) && GTK_WIDGET_REALIZED (GTK_WIDGET (paned))) {
                pos = GTK_WIDGET (paned)->allocation.width * percent /100;
@@ -363,7 +365,7 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        TnyFolderType type;
        ModestHeaderViewStyle style;
        gint sort_flag_id = 0;
-       gint sort_colid = -1, sort_type;
+       gint sort_colid = -1, sort_type = GTK_SORT_DESCENDING;
        
        folder = modest_header_view_get_folder (header_view);
        if (!folder)