* Do not modify the header view contents style when new messages are received

[modest] / src / modest-main.c

diff --git a/src/modest-main.c b/src/modest-main.c
index 498fc4d..4ca4f15 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -32,6 +32,7 @@
 #include <glib.h>
 #include <modest-runtime.h>
 #include <modest-init.h>
+#include "modest-platform.h"
 #include <gdk/gdk.h>
 #include <widgets/modest-main-window.h>
 #include <string.h>
@@ -56,9 +57,9 @@ main (int argc, char *argv[])
                g_thread_init (NULL);
 
        gdk_threads_init ();
-       gdk_threads_enter (); /* CHECKED */
+       gdk_threads_enter ();
 
-       if (!gtk_init_check(&argc, &argv)) {
+       if (!gtk_init_check (&argc, &argv)) {
                g_printerr ("modest: failed to initialize gtk\n");
                retval = 1;
                goto cleanup;
@@ -79,20 +80,25 @@ main (int argc, char *argv[])
        }
        
        /* Usually, we only show the UI when we get the "top_application" D-Bus method.
-        * This allows modest to start via D-Bus activation to provide a service, 
+        * This allows modest to start via D-Bus activation to provide a service,
         * without showing the UI.
         * The UI will be shown later (or just after starting if no otehr D-Bus method was used),
         * when we receive the "top_application" D-Bus method.
         */
-       if (show_ui_without_top_application_method)
+       if (show_ui_without_top_application_method) {
                gtk_widget_show_all (GTK_WIDGET(win));
+
+               /* Remove new mail notifications if exist */
+               modest_platform_remove_new_mail_notifications ();
+       }
        
-       
-       gtk_main ();    
-       retval = 0;
+       gtk_main ();
 
 cleanup:
-       gdk_threads_leave (); /* CHECKED */
+       gdk_threads_leave ();
+
+       /* Remove new mail notifications if exist */
+/*     modest_platform_remove_new_mail_notifications (); */
 
        if (!modest_init_uninit ()) {
                g_printerr ("modest: modest_init_uninit failed\n");
@@ -101,4 +107,3 @@ cleanup:
 
        return retval;
 }
-