This is a manual merge of branch drop split view intro trunk.

[modest] / src / modest-ui-actions.h

diff --git a/src/modest-ui-actions.h b/src/modest-ui-actions.h
index 4fe0146..bc9924d 100644 (file)
--- a/src/modest-ui-actions.h
+++ b/src/modest-ui-actions.h
@@ -35,6 +35,7 @@
 #include <widgets/modest-recpt-view.h>
 #include "modest-mail-operation.h"
 #include "modest-tny-send-queue.h"
+#include "modest-plugin-ui-actions.h"
 
 G_BEGIN_DECLS
 
@@ -45,6 +46,8 @@ void     modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWin
 
 void     modest_ui_actions_on_delete_message     (GtkAction *action, ModestWindow *win);
 
+gboolean modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win);
+
 void     modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow *win);
 
 void     modest_ui_actions_on_quit          (GtkAction *action, ModestWindow *win);
@@ -57,6 +60,7 @@ void     modest_ui_actions_on_accounts      (GtkAction *action, ModestWindow *wi
 
 void     modest_ui_actions_on_smtp_servers  (GtkAction *action, ModestWindow *win);
 
+void     modest_ui_actions_add_to_contacts   (GtkAction *action, ModestWindow *win);
 void     modest_ui_actions_on_add_to_contacts   (GtkAction *action, ModestWindow *win);
 
 void     modest_ui_actions_on_select_contacts (GtkAction *action, ModestMsgEditWindow *win);
@@ -138,8 +142,9 @@ void     modest_ui_actions_on_header_selected          (ModestHeaderView *folder
                                                        TnyHeader *header,
                                                        ModestMainWindow *main_window);
 void     modest_ui_actions_on_header_activated         (ModestHeaderView *folder_view, 
-                                                        TnyHeader *header,
-                                                        ModestMainWindow *main_window);
+                                                       TnyHeader *header,
+                                                       GtkTreePath *path,
+                                                       ModestWindow *main_window);
 
 void     modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
                                                         TnyFolderStore *folder_store, 
@@ -540,5 +545,6 @@ void modest_ui_actions_transfer_messages_helper (GtkWindow *win,
                                                 TnyList *headers,
                                                 TnyFolder *dst_folder);
 
+
 G_END_DECLS
 #endif /* __MODEST_UI_ACTIONS_H__ */