* Modest is properly finalized after sending an email

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index f313ed7..619b31e 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -277,6 +277,9 @@ modest_init_uninit (void)
        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;
 }
@@ -523,9 +526,9 @@ 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);
@@ -548,15 +551,23 @@ 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*\/ */
+
+#ifdef MODEST_PLATFORM_MAEMO
+       /* 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 *lang = getenv ("LANG");
+       if (!lang) 
+               setenv ("LANGUAGE", "en_GB", 1);
+       else {
+               gchar *language = g_strdup_printf ("%s:en_GB", lang);
+               setenv ("LANGUAGE", language, 1);
+               g_free (language);
+       }
+       /* end of little trick */
+#endif /*MODEST_PLATFORM_MAEMO */
        
        gettext_package = GETTEXT_PACKAGE;