Set default icon size for editor

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

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index f587eda..a57ee45 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -282,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)); 
@@ -380,24 +380,10 @@ static void setup_menu (ModestFolderWindow *self)
                                           NULL,
                                           APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive));
+
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
                                           APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
-
-       /* Settings menu buttons */
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_account"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_new_account),
-                                          NULL);
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_accounts"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_accounts),
-                                          NULL);
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_options"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_settings),
-                                          NULL);
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_globalsmtpservers"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_smtp_servers),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_tools_smtp_servers));
-       
 }
 
 static void
@@ -419,6 +405,10 @@ on_folder_activated (ModestFolderView *folder_view,
        if (!TNY_IS_FOLDER (folder))
                return;
 
+       /* We cannot open noselect folders (fake ones) */
+       if (tny_folder_get_caps (folder) & TNY_FOLDER_CAPS_NOSELECT)
+               return;
+
        headerwin = modest_header_window_new (folder);
        modest_window_mgr_register_window (modest_runtime_get_window_mgr (), 
                                           MODEST_WINDOW (headerwin),