* Allow incremental filling of the headers view while refreshing the folder

[modest] / src / modest-init.c

diff --git a/src/modest-init.c b/src/modest-init.c
index f75354f..98ed12d 100644 (file)
--- a/src/modest-init.c
+++ b/src/modest-init.c
@@ -49,10 +49,9 @@
 #include "widgets/modest-global-settings-dialog.h"
 #include "modest-tny-msg.h"
 #ifdef MODEST_PLATFORM_MAEMO
-#include <hildon/hildon-notification.h>
-#else
-#include <libnotify/notify.h>
+#include "modest-hildon-includes.h"
 #endif
+#include <locale.h>
 
 static gboolean init_header_columns (ModestConf *conf, gboolean overwrite);
 static gboolean init_default_account_maybe  (ModestAccountMgr *acc_mgr);
@@ -187,11 +186,6 @@ modest_init_init_core (void)
        init_i18n();
        init_debug_g_type();
        init_debug_logging();
-
-       if (!g_thread_supported())
-               g_thread_init(NULL);
-       
-       gdk_threads_init ();
        
        if (!modest_runtime_init()) {
                modest_init_uninit ();
@@ -251,7 +245,9 @@ modest_init_init_ui (gint argc, gchar** argv)
        init_stock_icons ();
 
        /* Init notification system */
+       #ifndef MODEST_HILDON_VERSION_0
        notify_init ("Basics");
+       #endif
 
        return TRUE;
 }
@@ -510,6 +506,8 @@ init_i18n (void)
        
        bind_textdomain_codeset (gettext_package, "UTF-8");
        textdomain (gettext_package);
+
+       setlocale (LC_ALL, "");
 }