Fix modest_tny_msg_header_get_all_recipients_list (in case from is empty)
[modest] / src / modest-init.c
index 8f4108e..a4f4a89 100644 (file)
@@ -27,6 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/utsname.h>
 #include <config.h>
 #include <glib.h>
 #include <glib-object.h>
@@ -35,6 +36,7 @@
 #include <modest-runtime-priv.h>
 #include <modest-init.h>
 #include <modest-defs.h>
+#include "modest-address-book.h"
 #include <modest-singletons.h>
 #include <widgets/modest-header-view.h>
 #include <widgets/modest-folder-view.h>
 #include <modest-icon-names.h>
 #include "widgets/modest-global-settings-dialog.h"
 #include "modest-tny-msg.h"
-#ifdef MODEST_PLATFORM_MAEMO
+#include <libgnomevfs/gnome-vfs.h>
+#include <string.h>
+#include "modest-text-utils.h"
+
+#ifndef MODEST_TOOLKIT_GTK
 #include "modest-hildon-includes.h"
 #endif
 #include <locale.h>
@@ -63,6 +69,9 @@ static void     init_default_settings (ModestConf *conf);
 static void     init_device_name (ModestConf *conf);
 static gboolean init_ui (gint argc, gchar** argv);
 
+
+static gboolean _is_initialized = FALSE;
+
 /*
  * defaults for the column headers
  */
@@ -73,10 +82,10 @@ typedef struct {
 } FolderCols;
 
 
-static const guint MODEST_MAIN_PANED_POS = 280;
+static const guint MODEST_MAIN_PANED_POS_PERCENTAGE = 30;
+static const guint MODEST_MSG_PANED_POS_PERCENTAGE = 50;
 
 static const FolderCols INBOX_COLUMNS_DETAILS[] = {
-       {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0},
        {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40, 0},
        {MODEST_HEADER_VIEW_COLUMN_FROM,    80, 0},
        {MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80, 0},
@@ -89,7 +98,6 @@ static const FolderCols INBOX_COLUMNS_TWOLINES[] = {
 };
 
 static const FolderCols OUTBOX_COLUMNS_DETAILS[] = {
-       {MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0},
        {MODEST_HEADER_VIEW_COLUMN_ATTACH,  40, 0},
        {MODEST_HEADER_VIEW_COLUMN_TO,    80, 0},
        {MODEST_HEADER_VIEW_COLUMN_SUBJECT, 80, 0},
@@ -106,7 +114,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,
@@ -120,9 +128,10 @@ 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)
+static GList*
+new_cold_ids_gslist_from_array( const FolderCols* cols, guint col_num)
 {
        GList *result = NULL;
        
@@ -173,23 +182,46 @@ modest_init_get_default_header_view_column_ids (TnyFolderType folder_type, Modes
 }
 
 
+static gboolean
+force_ke_recv_load (void)
+{
+       if (strcmp ("cerm_device_memory_full",
+                   _KR("cerm_device_memory_full")) == 0) {
+               g_debug ("%s: cannot get translation for cerm_device_memory_full",
+                          __FUNCTION__);
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
+
 gboolean
 modest_init (int argc, char *argv[])
 {
        gboolean reset;
-       static gboolean invoked = FALSE;
 
-       if (invoked) {
-               g_printerr ("modest: modest_init_init_core may only be invoked once\n");
-               g_assert (!invoked); /* abort */
+       if (_is_initialized) {
+               g_printerr ("modest: %s may only be invoked once\n", __FUNCTION__);
                return FALSE;
-       } else
-               invoked = TRUE;
-
+       } 
+       
        init_i18n();
+
+       if (!force_ke_recv_load()) {
+               g_printerr ("modest: %s: ke-recv is missing "
+                           "or memory is very low\n", __FUNCTION__);
+               /* don't return FALSE here, because it might be that ke-recv is 
+                  missing. TODO: find a way to verify that
+               */
+       }
+
        init_debug_g_type();
        init_debug_logging();
 
+       /* initialize the prng, we need it when creating random files */
+       srandom((int)getpid());
+       
        if (!gnome_vfs_initialized()) {
                if (!gnome_vfs_init ()) {
                        g_printerr ("modest: failed to init gnome-vfs\n");
@@ -203,6 +235,8 @@ modest_init (int argc, char *argv[])
                return FALSE;
        }
        
+       modest_plugin_factory_load_all (modest_runtime_get_plugin_factory ());
+
        /* do an initial guess for the device name */
        init_device_name (modest_runtime_get_conf());
        
@@ -212,6 +246,9 @@ modest_init (int argc, char *argv[])
                return FALSE;
        }
 
+       /* Initialize addressbook */
+       modest_address_book_init ();
+
        reset = modest_runtime_get_debug_flags () & MODEST_RUNTIME_DEBUG_FACTORY_SETTINGS;
        if (!init_header_columns(modest_runtime_get_conf(), reset)) {
                modest_init_uninit ();
@@ -238,8 +275,8 @@ modest_init (int argc, char *argv[])
                g_printerr ("modest: failed to init ui\n");
                return FALSE;
        }
-       
-       return TRUE;
+
+       return _is_initialized = TRUE;
 }
 
 
@@ -248,7 +285,7 @@ init_ui (gint argc, gchar** argv)
 {
        /* Set application name */
        g_set_application_name (modest_platform_get_app_name());
-       /* g_message (modest_platform_get_app_name()); */
+       /* g_debug (modest_platform_get_app_name()); */
 
        /* Init stock icons */
        init_stock_icons ();
@@ -264,12 +301,19 @@ init_ui (gint argc, gchar** argv)
 gboolean
 modest_init_uninit (void)
 {
+       if (!_is_initialized)
+               return TRUE; 
+       
        if (!modest_runtime_uninit())
                g_printerr ("modest: failed to uninit runtime\n");
 
-       if (gnome_vfs_initialized())
-               gnome_vfs_shutdown ();
+       if (!modest_platform_uninit())
+               g_printerr ("modest: failed to uninit platform\n");
        
+       if (gnome_vfs_initialized()) /* apparently, this returns TRUE, even after a shutdown */
+               gnome_vfs_shutdown ();
+
+       _is_initialized = FALSE;
        return TRUE;
 }
 
@@ -319,7 +363,7 @@ save_header_settings (ModestConf *conf, TnyFolderType type,
 
        if ( col_num > 0 ) {
                gint sort_col_id;
-               if (cols[i].col == MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT)
+               if (cols[0].col == MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT)
                        sort_col_id = TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN;
                else
                        sort_col_id = TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN;
@@ -348,7 +392,7 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
        gchar *key;
        
        for (folder_type = TNY_FOLDER_TYPE_UNKNOWN;
-            folder_type <= TNY_FOLDER_TYPE_CALENDAR; ++folder_type) {          
+            folder_type < TNY_FOLDER_TYPE_NUM; ++folder_type) {                
                
                switch (folder_type) {
                case TNY_FOLDER_TYPE_SENT:
@@ -386,11 +430,21 @@ init_header_columns (ModestConf *conf, gboolean overwrite)
                };
        }
        
-       key = _modest_widget_memory_get_keyname (MODEST_CONF_MAIN_PANED_KEY, MODEST_WIDGET_MEMORY_PARAM_POS);
+       key = _modest_widget_memory_get_keyname (MODEST_CONF_MAIN_PANED_KEY, 
+                                                MODEST_WIDGET_MEMORY_PARAM_POS);
+       /* 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_float (conf, key, MODEST_MAIN_PANED_POS_PERCENTAGE, NULL);
+       
+       g_free (key);
+
+       key = _modest_widget_memory_get_keyname (MODEST_CONF_MSG_PANED_KEY, 
+                                                MODEST_WIDGET_MEMORY_PARAM_POS);
        /* 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, NULL);
+               modest_conf_set_float (conf, key, MODEST_MSG_PANED_POS_PERCENTAGE, NULL);
        
        g_free (key);
        return TRUE;
@@ -430,7 +484,7 @@ gboolean modest_init_one_local_folder (gchar *maildir_path)
  */
 gboolean
 modest_init_local_folders (const gchar* location_filepath)
-{      
+{
        gboolean retval = TRUE;
 
        gchar *maildir_path = modest_local_folder_info_get_maildir_path (location_filepath);
@@ -441,21 +495,14 @@ modest_init_local_folders (const gchar* location_filepath)
                 */
 
                gchar *dir = g_build_filename (maildir_path,
-                               "Archive", NULL);                       
+                                              modest_local_folder_info_get_type_name(TNY_FOLDER_TYPE_ARCHIVE),
+                                              NULL);
                const gboolean created = modest_init_one_local_folder (dir);
                g_free(dir);
-                       
-               if (!created) {
-                       retval = FALSE;
-               }
 
-               #if 0
-               /* Do this if we only create the top-level dir: */
-               if (g_mkdir_with_parents (maildir_path, 0755) < 0) {
-                       g_printerr ("modest: %s: failed to create %s\n", __FUNCTION__, location_filepath);
+               if (!created) {
                        retval = FALSE;
                }
-               #endif
        }
        else {
                /* Create each of the standard on-disk folders.
@@ -464,16 +511,16 @@ modest_init_local_folders (const gchar* location_filepath)
                for (i = 0; i != G_N_ELEMENTS(LOCAL_FOLDERS); ++i) {
                        gchar *dir = g_build_filename (maildir_path,
                                                        modest_local_folder_info_get_type_name(LOCAL_FOLDERS[i]),
-                                                       NULL);                  
+                                                       NULL);
                        const gboolean created = modest_init_one_local_folder (dir);
                        g_free(dir);
-                       
+
                        if (!created) {
                                retval = FALSE;
                        }
                }
        }
-       
+
        g_free (maildir_path);
        return retval;
 }
@@ -513,19 +560,37 @@ init_debug_g_type (void)
        gflags = 0;
        mflags = modest_runtime_get_debug_flags ();
 
-       if (mflags & MODEST_RUNTIME_DEBUG_DEBUG_OBJECTS)
+       if (mflags & MODEST_RUNTIME_DEBUG_OBJECTS)
                gflags |= G_TYPE_DEBUG_OBJECTS;
-       if (mflags & MODEST_RUNTIME_DEBUG_DEBUG_SIGNALS)
+       if (mflags & MODEST_RUNTIME_DEBUG_SIGNALS)
                gflags |= G_TYPE_DEBUG_SIGNALS;
 
        g_type_init_with_debug_flags (gflags);
 }
 
+#ifndef DEBUG
+static void 
+null_log(const gchar* dom, 
+        GLogLevelFlags l, 
+        const gchar* m, 
+        gpointer d)
+{
+       return;
+};
+#endif
+
 static void
 init_debug_logging (void)
 {
        ModestRuntimeDebugFlags mflags;
        mflags = modest_runtime_get_debug_flags ();
+
+#ifndef DEBUG
+       if (! (mflags & MODEST_RUNTIME_DEBUG_CODE)) {
+               g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, null_log, NULL);
+       }
+#endif
+
        
        if (mflags & MODEST_RUNTIME_DEBUG_ABORT_ON_WARNING)
                g_log_set_always_fatal (G_LOG_LEVEL_ERROR |
@@ -537,23 +602,16 @@ init_debug_logging (void)
 static void
 init_i18n (void)
 {
-       const gchar* gettext_package;
-       /* Setup gettext, to use our .po files: */
-       /* GETTEXT_PACKAGE and MODEST_LOCALE_DIR are defined in config.h */
-/* #ifdef MODEST_HILDON_VERSION_0 */
-/*     gettext_package = GETTEXT_PACKAGE; */
-/*     bindtextdomain (gettext_package, MODEST_LOCALE_DIR); */
-/* #else */
-/*     gettext_package = "osso-email"; /\* HACK to use the localizations *\/ */
-/*     bindtextdomain (gettext_package, "/usr/share/locale"); */
-/* #endif /\*MODEST_HILDON_VERSION_0*\/ */
-       
-       gettext_package = GETTEXT_PACKAGE;
+       const gchar *lc_messages = getenv ("LC_MESSAGES");
 
-       bind_textdomain_codeset (gettext_package, "UTF-8");
-       textdomain (gettext_package);
+       if (!lc_messages) {
+               setenv ("LANGUAGE", "en_GB", 1);
+               setenv ("LC_MESSAGES", "en_GB", 1);
+       }
 
-       setlocale (LC_ALL, "");
+       bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
+       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+       textdomain (GETTEXT_PACKAGE);
 }
 
 
@@ -565,7 +623,7 @@ static void
 init_stock_icons (void)
 {
        static gboolean registered = FALSE;
-  
+
        if (!registered) {
                GtkIconTheme *current_theme;
                GdkPixbuf *pixbuf;
@@ -573,47 +631,38 @@ init_stock_icons (void)
                gint i;
 
                static GtkStockItem items[] = {
-#ifdef MODEST_PLATFORM_MAEMO
-                       { MODEST_STOCK_SPLIT_VIEW, "split view", 0, 0, NULL },
+#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 },
-/*                     { MODEST_STOCK_SEND_RECEIVE, "send receive", 0, 0, NULL },  */
                        { MODEST_STOCK_REPLY, "reply", 0, 0, NULL },
                        { MODEST_STOCK_REPLY_ALL, "reply all", 0, 0, NULL },
                        { MODEST_STOCK_FORWARD, "forward", 0, 0, NULL },
-                       { MODEST_STOCK_DELETE, "delete", 0, 0, NULL }, 
-/*                     { MODEST_STOCK_NEXT, "next", 0, 0, NULL }, */
-/*                     { MODEST_STOCK_PREV, "prev", 0, 0, NULL }, */
-/*                     { MODEST_STOCK_STOP, "stop", 0, 0, NULL } */
+                       { MODEST_STOCK_DELETE, "delete", 0, 0, NULL },
                };
-      
+
                static gchar *items_names [] = {
-#ifdef MODEST_PLATFORM_MAEMO
-                       MODEST_TOOLBAR_ICON_SPLIT_VIEW,
+#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,
-/*                     MODEST_TOOLBAR_ICON_SEND_RECEIVE,  */
-                       MODEST_TOOLBAR_ICON_REPLY,      
+                       MODEST_TOOLBAR_ICON_REPLY,
                        MODEST_TOOLBAR_ICON_REPLY_ALL,
                        MODEST_TOOLBAR_ICON_FORWARD,
-                       MODEST_TOOLBAR_ICON_DELETE, 
-/*                     MODEST_TOOLBAR_ICON_NEXT, */
-/*                     MODEST_TOOLBAR_ICON_PREV, */
-/*                     MODEST_TOOLBAR_ICON_STOP */
-                       MODEST_TOOLBAR_ICON_FORMAT_BULLETS,
+                       MODEST_TOOLBAR_ICON_DELETE,
                };
 
                registered = TRUE;
 
                /* Register our stock items */
                gtk_stock_add (items, G_N_ELEMENTS (items));
-      
+
                /* Add our custom icon factory to the list of defaults */
                factory = gtk_icon_factory_new ();
                gtk_icon_factory_add_default (factory);
@@ -623,10 +672,14 @@ 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,
+#ifdef MODEST_TOOLKIT_HILDON2
+                                                          MODEST_ICON_SIZE_BIG,
+#else
+                                                          MODEST_ICON_SIZE_SMALL,
+#endif
                                                           GTK_ICON_LOOKUP_NO_SVG,
                                                           NULL);
 #else
@@ -635,17 +688,21 @@ init_stock_icons (void)
 
                        if (pixbuf != NULL) {
                                GtkIconSet *icon_set;
-                               GdkPixbuf *transparent;
 
+#ifndef MODEST_TOOLKIT_HILDON2
+                               GdkPixbuf *transparent;
                                transparent = gdk_pixbuf_add_alpha (pixbuf, TRUE, 0xff, 0xff, 0xff);
                                icon_set = gtk_icon_set_new_from_pixbuf (transparent);
+                               g_object_unref (transparent);
+#else
+                               icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+#endif
                                gtk_icon_factory_add (factory, items[i].stock_id, icon_set);
                                gtk_icon_set_unref (icon_set);
                                g_object_unref (pixbuf);
-                               g_object_unref (transparent);
                        }
                        else
-                               g_warning ("failed to load %s icon", items_names[i]);
+                               g_warning ("%s: failed to load %s icon", __FUNCTION__, items_names[i]);
                }
                /* Drop our reference to the factory, GTK will hold a reference. */
                g_object_unref (factory);
@@ -656,29 +713,46 @@ init_stock_icons (void)
 static void
 init_default_settings (ModestConf *conf)
 {
-       if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_TOOLBAR, NULL))
-               modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR, TRUE, NULL);
+       /* Show toolbar keys */
+       if (!modest_conf_key_exists (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR, TRUE, NULL);
+
+       if (!modest_conf_key_exists (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_MAIN_WINDOW_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL);
 
-       if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL))
-               modest_conf_set_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL);
+       if (!modest_conf_key_exists (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR, TRUE, NULL);
+
+       if (!modest_conf_key_exists (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_MSG_VIEW_WINDOW_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL);
+
+       if (!modest_conf_key_exists (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR, TRUE, NULL);
        
+       if (!modest_conf_key_exists (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_EDIT_WINDOW_SHOW_TOOLBAR_FULLSCREEN, TRUE, NULL);
+
+       /* Editor keys */
        if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_CC, NULL))
-               modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, TRUE, NULL);
+               modest_conf_set_bool (conf, MODEST_CONF_SHOW_CC, FALSE, NULL);
 
        if (!modest_conf_key_exists (conf, MODEST_CONF_SHOW_BCC, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_SHOW_BCC, FALSE, NULL);
 
-/* Not used:
-       if (!modest_conf_key_exists (conf, MODEST_CONF_CONNECT_AT_STARTUP, NULL))
-               modest_conf_set_bool (conf, MODEST_CONF_CONNECT_AT_STARTUP, TRUE, NULL);
-*/
+       /* File chooser keys */
+       if (!modest_conf_key_exists (conf, MODEST_CONF_LATEST_ATTACH_FILE_PATH, NULL))
+               modest_conf_set_string (conf, MODEST_CONF_LATEST_ATTACH_FILE_PATH, "", NULL);
+       if (!modest_conf_key_exists (conf, MODEST_CONF_LATEST_INSERT_IMAGE_PATH, NULL))
+               modest_conf_set_string (conf, MODEST_CONF_LATEST_INSERT_IMAGE_PATH, "", NULL);
+       if (!modest_conf_key_exists (conf, MODEST_CONF_LATEST_SAVE_ATTACHMENT_PATH, NULL))
+               modest_conf_set_string (conf, MODEST_CONF_LATEST_SAVE_ATTACHMENT_PATH, "", NULL);
 
        /* Global settings */
        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_UPDATE_WHEN_CONNECTED_BY, NULL))
-               modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN, NULL);
+               modest_conf_set_int (conf, MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, MODEST_CONNECTED_VIA_WLAN_OR_WIMAX, NULL);
 
        if (!modest_conf_key_exists (conf, MODEST_CONF_UPDATE_INTERVAL, NULL))
                modest_conf_set_int (conf, MODEST_CONF_UPDATE_INTERVAL, MODEST_UPDATE_INTERVAL_15_MIN, NULL);
@@ -689,11 +763,19 @@ init_default_settings (ModestConf *conf)
        if (!modest_conf_key_exists (conf, MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_PLAY_SOUND_MSG_ARRIVE, FALSE, NULL);
 
+#ifdef MODEST_TOOLKIT_GTK
+       /* In Gnome port, we only allow editting plain text */
+       modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, FALSE, NULL);
+#else
        if (!modest_conf_key_exists (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, NULL))
                modest_conf_set_bool (conf, MODEST_CONF_PREFER_FORMATTED_TEXT, TRUE, NULL);
+#endif
 
        if (!modest_conf_key_exists (conf, MODEST_CONF_REPLY_TYPE, NULL))
                modest_conf_set_int (conf, MODEST_CONF_REPLY_TYPE, MODEST_TNY_MSG_REPLY_TYPE_QUOTE, NULL);
+
+       if (!modest_conf_key_exists (conf, MODEST_CONF_FETCH_HTML_EXTERNAL_IMAGES, NULL))
+               modest_conf_set_bool (conf, MODEST_CONF_FETCH_HTML_EXTERNAL_IMAGES, FALSE, NULL);
 }
 
 
@@ -704,28 +786,16 @@ init_default_settings (ModestConf *conf)
 static void
 init_device_name (ModestConf *conf)
 {
-       unsigned int len = 255; /* max len */
-       gchar *devname = NULL;
-       
-       if (!g_file_get_contents("/etc/hostname", &devname, &len, NULL) || len < 2 || len > 254) {
-               g_printerr ("modest: failed to read hostname\n");
-               modest_conf_set_string (conf, MODEST_CONF_DEVICE_NAME,
-                                       MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME,
+       struct utsname name;
+
+       if (uname (&name) == 0) {
+               modest_conf_set_string (modest_runtime_get_conf(),
+                                       MODEST_CONF_DEVICE_NAME, name.nodename,
                                        NULL);
        } else {
-               /* remove the \n at the end */
-               if (devname[len-1] == '\n')
-                       devname[len-1] = '\0';
-               else
-                       devname[len] = '\0';
-
-               GError *err = NULL;
-               if (!modest_conf_set_string (conf, MODEST_CONF_DEVICE_NAME,devname, &err)) {
-                       g_printerr ("modest: error setting device name '%s': %s",
-                                   devname, err ? err->message: "?");
-                       g_error_free (err);
-               }
+               modest_conf_set_string (modest_runtime_get_conf(),
+                                       MODEST_CONF_DEVICE_NAME,
+                                       MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME,
+                                       NULL);
        }
-       
-       g_free (devname);
 }