* check if current_folder != NULL;

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

diff --git a/src/modest-ui-actions.h b/src/modest-ui-actions.h
index dce58d2..c9dd225 100644 (file)
--- a/src/modest-ui-actions.h
+++ b/src/modest-ui-actions.h
@@ -94,7 +94,7 @@ void     modest_ui_actions_on_settings      (GtkAction *action, ModestWindow *wi
  * 
  * Shows the help dialog
  **/
-void     modest_ui_actions_on_help          (GtkAction *action, ModestWindow *win);
+void     modest_ui_actions_on_help          (GtkAction *action, GtkWindow *win);
 
 /**
  * modest_ui_actions_toggle_folders_view:
@@ -337,43 +337,7 @@ void     modest_ui_actions_on_retrieve_msg_contents       (GtkAction *action,
                                                           ModestWindow *window);
 
 void
-modest_ui_actions_on_email_menu_activated (GtkAction *action,
-                                         ModestWindow *window);
-
-void
-modest_ui_actions_on_edit_menu_activated (GtkAction *action,
-                                         ModestWindow *window);
-
-void
-modest_ui_actions_on_format_menu_activated (GtkAction *action,
-                                           ModestWindow *window);
-
-void
-modest_ui_actions_on_view_menu_activated (GtkAction *action,
-                                         ModestWindow *window);
-
-void
-modest_ui_actions_on_tools_menu_activated (GtkAction *action,
-                                         ModestWindow *window);
-
-void
-modest_ui_actions_on_attachment_menu_activated (GtkAction *action,
-                                               ModestWindow *window);
-
-void
-modest_ui_actions_on_toolbar_csm_menu_activated (GtkAction *action,
-                                                ModestWindow *window);
-
-void
-modest_ui_actions_on_folder_view_csm_menu_activated (GtkAction *action,
-                                                    ModestWindow *window);
-
-void
-modest_ui_actions_on_header_view_csm_menu_activated (GtkAction *action,
-                                                    ModestWindow *window);
-
-void
-modest_ui_actions_check_toolbar_dimming_rules (ModestWindow *window);
+modest_ui_actions_check_window_dimming_rules (ModestWindow *window);
 
 /**
  * modest_ui_actions_move_folder_error_handler:
@@ -444,18 +408,6 @@ gboolean modest_ui_actions_msg_retrieval_check                (ModestMailOperati
 void     modest_ui_actions_get_msgs_full_error_handler         (ModestMailOperation *mail_op,
                                                                gpointer user_data);
 
-/** A convenience method, because deleting a message is 
- * otherwise complicated, and it's best to change it in one place 
- * when we change it.
- **/
-void modest_do_message_delete (TnyHeader *header, ModestWindow *win);
-
-/** A convenience method, because deleting a message is 
- * otherwise complicated, and it's best to change it in one place 
- * when we change it.
- **/
-void modest_do_messages_delete (TnyList *headers, ModestWindow *win);
-
 /* Show the account creation wizard dialog.
  * returns: TRUE if an account was created. FALSE if the user cancelled.
  */
@@ -497,13 +449,16 @@ void modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_qu
  * @param body_str Body of the message (without signature), or NULL
  * @param attachments List of file URIs to attach
  */
-void modest_ui_actions_compose_msg(ModestWindow *win,
-                                  const gchar *to_str,
-                                  const gchar *cc_str,
-                                  const gchar *bcc_str,
-                                  const gchar *subject_str,
-                                  const gchar *body_str,
-                                  GSList *attachments);
+void modest_ui_actions_compose_msg (ModestWindow *win,
+                                   const gchar *to_str,
+                                   const gchar *cc_str,
+                                   const gchar *bcc_str,
+                                   const gchar *subject_str,
+                                   const gchar *body_str,
+                                   GSList *attachments);
+
+void modest_ui_actions_on_account_connection_error (GtkWindow *parent_window,
+                                                   TnyAccount *account);
 
 G_END_DECLS
 #endif /* __MODEST_UI_ACTIONS_H__ */