X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-main-window.c;h=978f7bfe8f197ad0eddc38ac2765f5e4cb78d3aa;hp=4cd8dc214e7b5f387ab404e8027d3caa0d296f84;hb=12a672c559d983c4e49a7e4054ee14c0177ecb1c;hpb=197f0e3dd3cbaa120148d84441a83931dd1ad3d8

diff --git a/src/hildon2/modest-main-window.c b/src/hildon2/modest-main-window.c
index 4cd8dc2..978f7bf 100644
--- 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,24 +1685,18 @@ 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;
 	case MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS:
-		g_message ("This view is not supported in Fremantle style");
+		g_warning ("This view is not supported in Fremantle style");
 		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;
@@ -2467,7 +2455,7 @@ static void on_folder_view_row_activated (GtkTreeView *tree_view,
 			g_object_unref (folder_store);
 	}
 
-	g_message ("FOLDER VIEW CELL ACTIVATED");
+	g_debug ("FOLDER VIEW CELL ACTIVATED");
 	
 }
 
@@ -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);
 		}