trying to commit

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index ecd79b9..8f09230 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -191,7 +191,7 @@ modest_init_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_message (modest_platform_get_app_name()); */
 
        init_stock_icons ();
        return TRUE;
@@ -429,11 +429,19 @@ 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 */
-       bindtextdomain (GETTEXT_PACKAGE, MODEST_LOCALE_DIR);
-       bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-       textdomain (GETTEXT_PACKAGE);
+#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*/
+       
+       bind_textdomain_codeset (gettext_package, "UTF-8");
+       textdomain (gettext_package);
 }