Add new folder action in modest folder window

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

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index a1295ab..2b3c11a 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -42,6 +42,7 @@
 #include <modest-account-mgr-helpers.h>
 #include <modest-defs.h>
 #include <modest-ui-actions.h>
+#include <modest-window.h>
 #include <hildon/hildon-program.h>
 #include <hildon/hildon-banner.h>
 #include <tny-account-store-view.h>
@@ -362,16 +363,33 @@ static void setup_menu (ModestFolderWindow *self)
 
        app_menu = hildon_app_menu_new ();
 
+       /* folders actions */
+       add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: new folder"),
+                    G_CALLBACK (modest_ui_actions_on_new_folder));
+/*     add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_user_renamefolder"), */
+/*                  G_CALLBACK ()); */
+/*     add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: move folder"), */
+/*                  G_CALLBACK ()); */
+/*     add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: delete folder"), */
+/*                  G_CALLBACK ()); */
+
+       /* new message */
        add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_viewer_newemail"),
                     G_CALLBACK (modest_ui_actions_on_new_msg));
+
+       /* send receive actions should be only one visible always */
        add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_sendandreceive"),
                     G_CALLBACK (modest_ui_actions_on_send_receive));
+       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_outbox_cancelsend"),
+                    G_CALLBACK (modest_ui_actions_cancel_send));
 
        /* Settings menu buttons */
+       add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: new account"),
+                    G_CALLBACK (modest_ui_actions_on_new_account));
+       add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: edit accounts"),
+                    G_CALLBACK (modest_ui_actions_on_accounts));
        add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_options"),
                     G_CALLBACK (modest_ui_actions_on_settings));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_accounts"),
-                    G_CALLBACK (modest_ui_actions_on_accounts));
        add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_globalsmtpservers"),
                     G_CALLBACK (modest_ui_actions_on_smtp_servers));
        
@@ -395,6 +413,9 @@ on_folder_activated (ModestFolderView *folder_view,
        if (!folder)
                return;
 
+       if (!TNY_IS_FOLDER (folder))
+               return;
+
        headerwin = modest_header_window_new (folder);
        modest_window_mgr_register_window (modest_runtime_get_window_mgr (), 
                                           MODEST_WINDOW (headerwin),