#include <modest-icon-names.h>
#include "widgets/modest-global-settings-dialog.h"
#include "modest-tny-msg.h"
+#include <libgnomevfs/gnome-vfs.h>
#ifdef MODEST_PLATFORM_MAEMO
#include "modest-hildon-includes.h"
#endif
} FolderCols;
-static const guint MODEST_MAIN_PANED_POS = 280;
+static const guint MODEST_MAIN_PANED_POS_PERCENTAGE = 30;
static const FolderCols INBOX_COLUMNS_DETAILS[] = {
{MODEST_HEADER_VIEW_COLUMN_MSGTYPE, 40, 0},
if (!modest_runtime_uninit())
g_printerr ("modest: failed to uninit runtime\n");
+ if (!modest_platform_uninit())
+ g_printerr ("modest: failed to uninit platform\n");
+
_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, NULL);
+ modest_conf_set_int (conf, key, MODEST_MAIN_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);
}
{ 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 }, */
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;
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) {