Moved "Send&Receive" menu item to the first row.

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

diff --git a/src/hildon2/modest-main-window.c b/src/hildon2/modest-main-window.c
index 9116829..978f7bf 100644 (file)
--- a/src/hildon2/modest-main-window.c
+++ b/src/hildon2/modest-main-window.c
@@ -61,7 +61,6 @@
 #include "modest-progress-bar.h"
 #include "modest-text-utils.h"
 #include "modest-ui-dimming-manager.h"
-#include "modest-osso-state-saving.h"
 #include "modest-text-utils.h"
 #include "modest-signal-mgr.h"
 #include <tny-gtk-folder-store-tree-model.h>
@@ -1017,7 +1016,6 @@ on_hildon_program_is_topmost_notify(GObject *self,
                        hildon_program_set_can_hibernate (app, FALSE);
                else {
                        /* Allow hibernation, after saving the state: */
-                       modest_osso_save_state();
                        hildon_program_set_can_hibernate (app, TRUE);
                }
        }       
@@ -1048,10 +1046,6 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data)
        tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view),
                                                  TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()));
 
-       /* Load previous osso state, for instance if we are being restored from
-        * hibernation:  */
-       modest_osso_load_state ();
-
        /* Restore window & widget settings */
        priv->wait_for_settings = TRUE;
        restore_settings (MODEST_MAIN_WINDOW(self), TRUE);
@@ -1691,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;
@@ -1707,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;
@@ -2536,7 +2524,7 @@ on_window_hide (GObject    *gobject,
                        mail_op = modest_mail_operation_new (NULL);
                        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                                         mail_op);
-                       modest_mail_operation_sync_folder (mail_op, TNY_FOLDER (folder_store), FALSE);
+                       modest_mail_operation_sync_folder (mail_op, TNY_FOLDER (folder_store), FALSE, NULL, NULL);
                        g_object_unref (mail_op);
                        g_object_unref (folder_store);
                }