Only remove mail notifications for each account, when we see mails

[modest] / src / hildon2 / modest-main-window.c

diff --git a/src/hildon2/modest-main-window.c b/src/hildon2/modest-main-window.c
index aba0ca6..2416664 100644 (file)
--- a/src/hildon2/modest-main-window.c
+++ b/src/hildon2/modest-main-window.c
@@ -1003,7 +1003,7 @@ on_hildon_program_is_topmost_notify(GObject *self,
                hildon_program_set_can_hibernate (app, FALSE);
 
                /* Remove new mail visual notifications */
-               modest_platform_remove_new_mail_notifications (TRUE);
+               modest_platform_remove_new_mail_notifications (TRUE, NULL);
        } else {
                /* Allow hibernation if the program has gone to the background: */
                
@@ -1081,7 +1081,7 @@ osso_display_event_cb (osso_display_state_t state,
 
        /* Stop blinking if the screen becomes on */
        if (priv->display_state == OSSO_DISPLAY_ON)
-               modest_platform_remove_new_mail_notifications (TRUE);
+               modest_platform_remove_new_mail_notifications (TRUE, NULL);
 }
 
 ModestWindow *
@@ -1685,14 +1685,10 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
        switch (priv->contents_style) {
        case MODEST_MAIN_WINDOW_CONTENTS_STYLE_FOLDERS:
                wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->folder_view));
-               modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
-                                                     TRUE);
                gtk_widget_grab_focus (GTK_WIDGET (priv->folder_view));
                break;
        case MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS:
                wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->header_view));
-               modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
-                                                     TRUE);
                gtk_widget_grab_focus (GTK_WIDGET (priv->header_view));
                gtk_widget_show (GTK_WIDGET (priv->header_view));
                break;
@@ -1701,8 +1697,6 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
                break;
        case MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY:
                wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET (priv->empty_view));
-               modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->contents_widget),
-                                                     FALSE);
                if (priv->style == MODEST_MAIN_WINDOW_STYLE_SIMPLE)
                        gtk_widget_grab_focus (GTK_WIDGET (priv->empty_view));
                break;