X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-folder-window.c;h=e782b9d0936167c21a44e266c19bbbf8cabef018;hp=df924f112b88393da31c149f906c17c81b7c1ed8;hb=6e0ed95f0118e1954676abdade7dc00d4b7cb2fd;hpb=8091cf96d151b5401a702dc6a06913db72b64413

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index df924f1..e782b9d 100644
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -82,6 +82,7 @@ static void modest_folder_window_pack_toolbar (ModestHildon2Window *self,
 					       GtkWidget *toolbar);
 static void edit_mode_changed (ModestFolderWindow *folder_window,
 			       gint edit_mode_id,
+			       gboolean enabled,
 			       ModestFolderWindow *self);
 
 typedef struct _ModestFolderWindowPrivate ModestFolderWindowPrivate;
@@ -224,6 +225,8 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
 	priv->folder_view  = modest_platform_create_folder_view (query);
 	modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (priv->folder_view),
 					   MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT);
+	modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view), 
+				       MODEST_FOLDER_VIEW_FILTER_HIDE_ACCOUNTS);
 	g_signal_connect (G_OBJECT (self), "edit-mode-changed",
 			  G_CALLBACK (edit_mode_changed), (gpointer) self);
 
@@ -279,7 +282,7 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
 	modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
 						  EDIT_MODE_COMMAND_MOVE,
 						  _("mcen_ti_edit_move_folder"), 
-						  _("mcen_me_move"),
+						  _HL("wdgt_bd_move"),
 						  GTK_TREE_VIEW (priv->folder_view),
 						  GTK_SELECTION_SINGLE,
 						  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to));	
@@ -467,6 +470,7 @@ modest_folder_window_pack_toolbar (ModestHildon2Window *self,
 static void 
 edit_mode_changed (ModestFolderWindow *folder_window,
 		   gint edit_mode_id,
+		   gboolean enabled,
 		   ModestFolderWindow *self)
 {
 	ModestFolderWindowPrivate *priv;
@@ -490,5 +494,10 @@ edit_mode_changed (ModestFolderWindow *folder_window,
 		break;
 	}
 
-	modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view), filter);
+	if (enabled)
+		modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view), 
+					       filter);
+	else
+		modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (priv->folder_view), 
+						 filter);
 }