Add new folder action in modest folder window

pmo-trunk-r6964

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index a3f8285..2b3c11a 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -364,8 +364,8 @@ 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 ()); */
+       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"), */

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 1f4b5c5..ae9bbf4 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -53,6 +53,7 @@
 #include <hildon/hildon-pannable-area.h>
 #include <hildon/hildon-gtk.h>
 #include <modest-header-window.h>
+#include <modest-folder-window.h>
 #endif
 
 #ifdef MODEST_PLATFORM_MAEMO
@@ -3324,18 +3325,30 @@ modest_ui_actions_create_folder(GtkWidget *parent_window,
 }
 
 void 
-modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_window)
+modest_ui_actions_on_new_folder (GtkAction *action, ModestWindow *window)
 {
-       GtkWidget *folder_view;
        
-       g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
+       g_return_if_fail (MODEST_IS_WINDOW(window));
 
-       folder_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-       if (!folder_view)
-               return;
+       if (MODEST_IS_MAIN_WINDOW (window)) {
+               GtkWidget *folder_view;
 
-       modest_ui_actions_create_folder (GTK_WIDGET (main_window), folder_view);
+               folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window),
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+               if (!folder_view)
+                       return;
+
+               modest_ui_actions_create_folder (GTK_WIDGET (window), folder_view);
+#ifdef MODEST_TOOLKIT_HILDON2
+       } else if (MODEST_IS_FOLDER_WINDOW (window)) {
+               GtkWidget *folder_view;
+
+               folder_view = GTK_WIDGET (modest_folder_window_get_folder_view (MODEST_FOLDER_WINDOW (window)));
+               modest_ui_actions_create_folder (GTK_WIDGET (window), folder_view);
+#endif
+       } else {
+               g_assert_not_reached ();
+       }
 }
 
 static void

diff --git a/src/modest-ui-actions.h b/src/modest-ui-actions.h
index bc9924d..cf18285 100644 (file)
--- a/src/modest-ui-actions.h
+++ b/src/modest-ui-actions.h
@@ -256,7 +256,7 @@ void    modest_ui_actions_on_send_receive              (GtkAction *action,
                                                        ModestWindow *win);
 
 void     modest_ui_actions_on_new_folder               (GtkAction *action,
-                                                       ModestMainWindow *main_window);
+                                                       ModestWindow *main_window);
 
 void     modest_ui_actions_on_rename_folder            (GtkAction *action,
                                                        ModestMainWindow *main_window);