#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>
+
+#ifndef MODEST_TOOLKIT_GTK
#include "modest-hildon-includes.h"
#endif
#include <locale.h>
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
*/
} 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},
};
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},
{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,
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;
}
+static gboolean
+force_ke_recv_load (void)
+{
+ if (strcmp ("cerm_device_memory_full",
+ dgettext("ke-recv", "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;
- 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");
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());
g_printerr ("modest: failed to init ui\n");
return FALSE;
}
-
- return TRUE;
+
+ return _is_initialized = TRUE;
}
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;
}
};
}
- 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_int (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_int (conf, key, MODEST_MSG_PANED_POS_PERCENTAGE, NULL);
g_free (key);
return TRUE;
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);
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;
-
- bind_textdomain_codeset (gettext_package, "UTF-8");
- textdomain (gettext_package);
+ /* little trick make en_GB the fallback language, instead
+ * of the logical IDs
+ * we need the ugly ifdefs, because modest_platform_init is
+ * too late.
+ */
+ const gchar *lc_messages = getenv ("LC_MESSAGES");
+
+ if (!lc_messages) {
+ setenv ("LANGUAGE", "en_GB", 1);
+ setenv ("LC_MESSAGES", "en_GB", 1);
+ } else {
+ gchar *language = g_strdup_printf ("%s:en_GB", lc_messages);
+ setenv ("LANGUAGE", language, 1);
+ g_free (language);
+ }
+ /* end of little trick */
- setlocale (LC_ALL, "");
+ bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
}
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_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 }, */
};
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_ALL, */
-/* MODEST_TOOLBAR_ICON_FORWARD, */
+ 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_FORMAT_BULLETS, */
};
registered = TRUE;
/* 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,
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);
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);
-*/
-
/* 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);
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);
}
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);
projects / modest / blobdiff