* src/modest-ui-actions.[ch]:

        * Added new method to create new folder or message depending on
          where's the focus.
* src/maemo/modest-main-window-ui.h:
        * Now + toolbar button creates a new folder if focus is on a
          folder (fixes NB#79232).

pmo-trunk-r4024

diff --git a/src/maemo/modest-main-window-ui.h b/src/maemo/modest-main-window-ui.h
index 9da7705..ddb6c15 100644 (file)
--- a/src/maemo/modest-main-window-ui.h
+++ b/src/maemo/modest-main-window-ui.h
@@ -112,7 +112,7 @@ static const GtkActionEntry modest_action_entries [] = {
         * but we need to specificy them differently, they have icons for example
         */
        /* Headers Toolbar */
         * but we need to specificy them differently, they have icons for example
         */
        /* Headers Toolbar */

-       { "ToolbarMessageNew",        MODEST_STOCK_NEW_MAIL,     N_("qgn_toolb_messagin_new"), NULL, NULL,  G_CALLBACK (modest_ui_actions_on_new_msg) },
+       { "ToolbarMessageNew",        MODEST_STOCK_NEW_MAIL,     N_("qgn_toolb_messagin_new"), NULL, NULL,  G_CALLBACK (modest_ui_actions_on_new_msg_or_folder) },

        { "ToolbarMessageReply",      MODEST_STOCK_REPLY,     N_("mcen_me_inbox_reply"),      "<CTRL>R", NULL,  G_CALLBACK (modest_ui_actions_on_reply) },
        { "ToolbarMessageReplyAll",   MODEST_STOCK_REPLY_ALL,     N_("mcen_me_inbox_replytoall"),         NULL, NULL,  G_CALLBACK (modest_ui_actions_on_reply_all) },
        { "ToolbarMessageForward",    MODEST_STOCK_FORWARD,     N_("mcen_me_inbox_forward"),      NULL, NULL,  G_CALLBACK (modest_ui_actions_on_forward) },
        { "ToolbarMessageReply",      MODEST_STOCK_REPLY,     N_("mcen_me_inbox_reply"),      "<CTRL>R", NULL,  G_CALLBACK (modest_ui_actions_on_reply) },
        { "ToolbarMessageReplyAll",   MODEST_STOCK_REPLY_ALL,     N_("mcen_me_inbox_replytoall"),         NULL, NULL,  G_CALLBACK (modest_ui_actions_on_reply_all) },
        { "ToolbarMessageForward",    MODEST_STOCK_FORWARD,     N_("mcen_me_inbox_forward"),      NULL, NULL,  G_CALLBACK (modest_ui_actions_on_forward) },

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 7d2660b..18f87d8 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -813,6 +813,26 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
        modest_ui_actions_compose_msg(win, NULL, NULL, NULL, NULL, NULL, NULL);
 }
 
        modest_ui_actions_compose_msg(win, NULL, NULL, NULL, NULL, NULL, NULL);
 }
 

+void
+modest_ui_actions_on_new_msg_or_folder (GtkAction *action, ModestWindow *win)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (win));
+
+       /* Check first if the header view has the focus */
+       if (MODEST_IS_MAIN_WINDOW (win)) {
+               GtkWidget *w;
+               w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+                                                        MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+               if (gtk_widget_is_focus (w)) {
+                       modest_ui_actions_on_new_folder (action, MODEST_MAIN_WINDOW(win));
+                       return;
+               }
+       }
+
+       modest_ui_actions_on_new_msg (action, win);
+}
+
+

 gboolean 
 modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
                                       TnyHeader *header,
 gboolean 
 modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
                                       TnyHeader *header,

diff --git a/src/modest-ui-actions.h b/src/modest-ui-actions.h
index c9dd225..66e36de 100644 (file)
--- a/src/modest-ui-actions.h
+++ b/src/modest-ui-actions.h
@@ -67,6 +67,8 @@ void     modest_ui_actions_on_check_names (GtkAction *action, ModestMsgEditWindo
 
 void     modest_ui_actions_on_new_msg       (GtkAction *action, ModestWindow *win);
 
 
 void     modest_ui_actions_on_new_msg       (GtkAction *action, ModestWindow *win);
 

+void     modest_ui_actions_on_new_msg_or_folder (GtkAction *action, ModestWindow *win);
+

 void     modest_ui_actions_on_open           (GtkAction *action, ModestWindow *win);
 
 void     modest_ui_actions_on_reply         (GtkAction *action, ModestWindow *win);
 void     modest_ui_actions_on_open           (GtkAction *action, ModestWindow *win);
 
 void     modest_ui_actions_on_reply         (GtkAction *action, ModestWindow *win);