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

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index 2c00d84..7797e95 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -51,7 +51,7 @@
 #include <libgnomevfs/gnome-vfs.h>
 #include <string.h>
 
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
 #include "modest-hildon-includes.h"
 #endif
 #include <locale.h>
@@ -111,7 +111,7 @@ static const FolderCols SENT_COLUMNS_TWOLINES[] = {
        {MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT,180, 0},
 };
 
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
 static const TnyFolderType LOCAL_FOLDERS[] = {
 /*     TNY_FOLDER_TYPE_OUTBOX, */
        TNY_FOLDER_TYPE_DRAFTS,
@@ -125,7 +125,7 @@ static const TnyFolderType LOCAL_FOLDERS[] = {
        TNY_FOLDER_TYPE_TRASH,
        TNY_FOLDER_TYPE_ARCHIVE 
 };
-#endif /* MODEST_PLATFORM_MAEMO */
+#endif /* MODEST_TOOLKIT_GTK */
 
 static GList*
 new_cold_ids_gslist_from_array( const FolderCols* cols, guint col_num)
@@ -429,7 +429,7 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
        /* if we're not in overwrite mode, only write stuff it
         * there was nothing before */
        if (overwrite || !modest_conf_key_exists(conf, key, NULL)) 
-               modest_conf_set_int (conf, key, MODEST_MAIN_PANED_POS_PERCENTAGE, NULL);
+               modest_conf_set_float (conf, key, MODEST_MAIN_PANED_POS_PERCENTAGE, NULL);
        
        g_free (key);
 
@@ -438,7 +438,7 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
        /* if we're not in overwrite mode, only write stuff it
         * there was nothing before */
        if (overwrite || !modest_conf_key_exists(conf, key, NULL)) 
-               modest_conf_set_int (conf, key, MODEST_MSG_PANED_POS_PERCENTAGE, NULL);
+               modest_conf_set_float (conf, key, MODEST_MSG_PANED_POS_PERCENTAGE, NULL);
        
        g_free (key);
        return TRUE;
@@ -625,10 +625,10 @@ init_stock_icons (void)
                gint i;
 
                static GtkStockItem items[] = {
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
                        { MODEST_STOCK_SORT, "sort mail", 0, 0, NULL },
                        { MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL },
-#endif /*MODEST_PLATFORM_MAEMO*/
+#endif /*MODEST_TOOLKIT_GTK*/
                        { MODEST_STOCK_SPLIT_VIEW, "split view", 0, 0, NULL },
                        { MODEST_STOCK_MAIL_SEND, "send mail", 0, 0, NULL },
                        { MODEST_STOCK_NEW_MAIL, "new mail", 0, 0, NULL },
@@ -643,10 +643,10 @@ init_stock_icons (void)
                };
       
                static gchar *items_names [] = {
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
                        MODEST_TOOLBAR_ICON_SORT,
                        MODEST_TOOLBAR_ICON_REFRESH,
-#endif /*MODEST_PLATFORM_MAEMO*/
+#endif /*MODEST_TOOLKIT_GTK*/
                        MODEST_TOOLBAR_ICON_SPLIT_VIEW,
                        MODEST_TOOLBAR_ICON_MAIL_SEND,
                        MODEST_TOOLBAR_ICON_NEW_MAIL,
@@ -675,7 +675,7 @@ init_stock_icons (void)
                /* Register icons to accompany stock items */
                for (i = 0; i < G_N_ELEMENTS (items); i++) {
 
-#ifdef MODEST_PLATFORM_MAEMO  /* MODES_PLATFORM_ID: 1 ==> gnome, 2==> maemo */ 
+#ifndef MODEST_PLATFORM_GTK  
                        pixbuf = gtk_icon_theme_load_icon (current_theme,
                                                           items_names[i],
                                                           26,