Fix wptextview focus in gtk

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index 88d9459..56a9e7c 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -53,11 +53,10 @@
 #include <libgnomevfs/gnome-vfs.h>
 #include <string.h>
 #include "modest-text-utils.h"
-
-#ifndef MODEST_TOOLKIT_GTK
+#include <locale.h>
+#ifdef MODEST_TOOLKIT_HILDON2
 #include "modest-hildon-includes.h"
 #endif
-#include <locale.h>
 
 static gboolean init_header_columns (ModestConf *conf, gboolean overwrite);
 static gboolean init_default_account_maybe  (ModestAccountMgr *acc_mgr);
@@ -636,7 +635,7 @@ init_stock_icons (void)
                gint i;
 
                static GtkStockItem items[] = {
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2
                        { MODEST_STOCK_SORT, "sort mail", 0, 0, NULL },
                        { MODEST_STOCK_REFRESH, "refresh mail", 0, 0, NULL },
 #endif /*MODEST_TOOLKIT_GTK*/
@@ -650,7 +649,7 @@ init_stock_icons (void)
                };
 
                static gchar *items_names [] = {
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2
                        MODEST_TOOLBAR_ICON_SORT,
                        MODEST_TOOLBAR_ICON_REFRESH,
 #endif /*MODEST_TOOLKIT_GTK*/
@@ -756,6 +755,12 @@ init_default_settings (ModestConf *conf)
        if (!modest_conf_key_exists (conf, MODEST_CONF_AUTO_UPDATE, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_AUTO_UPDATE, TRUE, NULL);
 
+       if (!modest_conf_key_exists (conf, MODEST_CONF_NOTIFICATIONS, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_NOTIFICATIONS, TRUE, NULL);
+
+       if (!modest_conf_key_exists (conf, MODEST_CONF_AUTO_ADD_TO_CONTACTS, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_AUTO_ADD_TO_CONTACTS, TRUE, NULL);
+
        if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL))
                modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, NULL);