X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-init.c;h=677d2c8dcbf9325d80c0182a19e3883a60654392;hp=e81aa98fed9e033dc95be030f711a2523bf10293;hb=24c5dee833bff8a499b6b6bca3c58231ae2a7f96;hpb=c6e92e9c0075505a97acc092ee6ac7d694b4b6f2 diff --git a/src/modest-init.c b/src/modest-init.c index e81aa98..677d2c8 100644 --- a/src/modest-init.c +++ b/src/modest-init.c @@ -49,7 +49,9 @@ #include "widgets/modest-global-settings-dialog.h" #include "modest-tny-msg.h" #include -#ifdef MODEST_PLATFORM_MAEMO +#include + +#ifndef MODEST_TOOLKIT_GTK #include "modest-hildon-includes.h" #endif #include @@ -78,9 +80,9 @@ typedef struct { 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}, @@ -93,7 +95,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}, @@ -110,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, @@ -124,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) @@ -178,17 +179,40 @@ 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_warning ("%s: cannot get translation for cerm_device_memory_full", + __FUNCTION__); + return FALSE; + } + + return TRUE; +} + + gboolean modest_init (int argc, char *argv[]) { gboolean reset; if (_is_initialized) { - g_printerr ("modest: modest_init_init_core may only be invoked once\n"); + g_printerr ("modest: %s may only be invoked once\n", __FUNCTION__); return FALSE; } 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(); @@ -208,6 +232,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()); @@ -272,15 +298,15 @@ modest_init_uninit (void) if (!_is_initialized) return TRUE; - if (gnome_vfs_initialized()) /* apparently, this returns TRUE, even after a shutdown */ - gnome_vfs_shutdown (); - if (!modest_runtime_uninit()) g_printerr ("modest: failed to uninit runtime\n"); 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; } @@ -403,7 +429,16 @@ 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); + + 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_float (conf, key, MODEST_MSG_PANED_POS_PERCENTAGE, NULL); g_free (key); return TRUE; @@ -590,11 +625,11 @@ 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 }, */ @@ -608,11 +643,11 @@ init_stock_icons (void) }; 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, */ @@ -640,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, @@ -694,7 +729,7 @@ init_default_settings (ModestConf *conf) /* 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); @@ -704,7 +739,7 @@ init_default_settings (ModestConf *conf) 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); @@ -720,6 +755,9 @@ init_default_settings (ModestConf *conf) 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); } @@ -730,11 +768,11 @@ init_default_settings (ModestConf *conf) static void init_device_name (ModestConf *conf) { - unsigned int len = 255; /* max len */ + gsize 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"); + g_warning ("%s: failed to read hostname\n", __FUNCTION__); modest_conf_set_string (conf, MODEST_CONF_DEVICE_NAME, MODEST_LOCAL_FOLDERS_DEFAULT_DISPLAY_NAME, NULL);