X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-main-window.c;h=aba0ca680739d825d9a6179e2816e65750330422;hb=f3d583d6a6f5066b7f9ea655ee3c16c67a85a343;hp=801324abefb299fb8bd8ba12e716c0560d987375;hpb=755e518111fd7a392184651487338811efa47d14;p=modest

diff --git a/src/hildon2/modest-main-window.c b/src/hildon2/modest-main-window.c
index 801324a..aba0ca6 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>
@@ -262,10 +261,10 @@ static GtkWindowClass *parent_class = NULL;
 static const GtkActionEntry modest_folder_view_action_entries [] = {
 
 	/* Folder View CSM actions */
-	{ "FolderViewCSMNewFolder", NULL, N_("mcen_ti_new_folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_folder) },
+	{ "FolderViewCSMNewFolder", NULL, N_("ckdg_fi_new_folder_name"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_folder) },
 	{ "FolderViewCSMRenameFolder", NULL, N_("mcen_me_rename_folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) },
 	{ "FolderViewCSMPasteMsgs", NULL, N_("mcen_me_inbox_paste"), NULL, NULL,  G_CALLBACK (modest_ui_actions_on_paste)},
-	{ "FolderViewCSMDeleteFolder", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) },
+	{ "FolderViewCSMDeleteFolder", NULL, N_("mcen_me_delete_messages"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) },
 };
 
 static const GtkActionEntry modest_header_view_action_entries [] = {
@@ -278,7 +277,7 @@ static const GtkActionEntry modest_header_view_action_entries [] = {
 	{ "HeaderViewCSMCut",           NULL,  N_("mcen_me_inbox_cut"),         "<CTRL>X", NULL, G_CALLBACK (modest_ui_actions_on_cut) },
 	{ "HeaderViewCSMCopy",          NULL,  N_("mcen_me_inbox_copy"),        "<CTRL>C", NULL, G_CALLBACK (modest_ui_actions_on_copy) },
 	{ "HeaderViewCSMPaste",         NULL,  N_("mcen_me_inbox_paste"),       "<CTRL>V", NULL, G_CALLBACK (modest_ui_actions_on_paste) },
-	{ "HeaderViewCSMDelete",        NULL,  N_("mcen_me_inbox_delete"),      NULL,      NULL, G_CALLBACK (modest_ui_actions_on_delete_message) },
+	{ "HeaderViewCSMDelete",        NULL,  N_("mcen_me_delete_messages"),      NULL,      NULL, G_CALLBACK (modest_ui_actions_on_delete_message) },
 	{ "HeaderViewCSMCancelSending", NULL,  N_("mcen_me_outbox_cancelsend"), NULL,      NULL, G_CALLBACK (modest_ui_actions_cancel_send) },
 };
 
@@ -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);
@@ -1703,7 +1697,7 @@ modest_main_window_set_contents_style (ModestMainWindow *self,
 		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));
@@ -2226,7 +2220,7 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window)
 {
 	g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (window), FALSE);
 
-	hildon_banner_show_information (NULL, NULL, dgettext("hildon-common-strings", "ckct_ib_cannot_zoom_here"));
+	hildon_banner_show_information (NULL, NULL, _CS("ckct_ib_cannot_zoom_here"));
 	return FALSE;
 
 }
@@ -2467,7 +2461,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 +2530,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);
 		}