* Now modest_plugin_ui_actions methods disappear, and we export

  directly the internal used methods in modest.

pmo-trunk-r6363

diff --git a/src/Makefile.am b/src/Makefile.am
index e19d98c..36eaa12 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -107,7 +107,6 @@ libmodest_la_SOURCES=\
        modest-plugin.c \
        modest-plugin-factory.c \
        modest-plugin-factory.h \
        modest-plugin.c \
        modest-plugin-factory.c \
        modest-plugin-factory.h \

-       modest-plugin-ui-actions.c \

        modest-progress-object.c \
        modest-progress-object.h \
        modest-protocol.c \
        modest-progress-object.c \
        modest-progress-object.h \
        modest-protocol.c \

diff --git a/src/modest-plugin-ui-actions.h b/src/modest-plugin-ui-actions.h
index e5b6ac3..775687e 100644 (file)
--- a/src/modest-plugin-ui-actions.h
+++ b/src/modest-plugin-ui-actions.h
@@ -39,8 +39,21 @@
 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

-gboolean modest_plugin_ui_actions_on_delete_account (GtkWindow *parent_window,
-                                                    const gchar *account_name,
-                                                    const gchar *account_display_name);
+/**
+ * modest_ui_actions_on_delete_account:
+ * @parent_window: the parent #GtkWindow of the dialog that will be shown
+ * @account_name: the modest name for the account to be deleted
+ * @account_display_name: the display name that will be used in the dialog
+ *
+ * This function will perform the actions required to delete an
+ * account. This function assumes that the account to be deleted is
+ * already disconnected, so the caller must verify that this is the
+ * case. Otherwise weird behaviours could happen
+ *
+ * Returns: TRUE if the account was successfully deleted, FALSE otherwise
+ **/
+gboolean modest_ui_actions_on_delete_account (GtkWindow *parent_window,
+                                             const gchar *account_name,
+                                             const gchar *account_display_name);

 G_END_DECLS
 #endif /* __MODEST_PLUGIN_UI_ACTIONS_H__ */
 G_END_DECLS
 #endif /* __MODEST_PLUGIN_UI_ACTIONS_H__ */

diff --git a/src/modest-ui-actions.h b/src/modest-ui-actions.h
index 9c2c2ff..1408a30 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 <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
 
 
 G_BEGIN_DECLS
 

@@ -540,22 +541,6 @@ void modest_ui_actions_transfer_messages_helper (GtkWindow *win,
                                                 TnyList *headers,
                                                 TnyFolder *dst_folder);
 
                                                 TnyList *headers,
                                                 TnyFolder *dst_folder);
 

-/**
- * modest_ui_actions_on_delete_account:
- * @parent_window: the parent #GtkWindow of the dialog that will be shown
- * @account_name: the modest name for the account to be deleted
- * @account_display_name: the display name that will be used in the dialog
- *
- * This function will perform the actions required to delete an
- * account. This function assumes that the account to be deleted is
- * already disconnected, so the caller must verify that this is the
- * case. Otherwise weird behaviours could happen
- *
- * Returns: TRUE if the account was successfully deleted, FALSE otherwise
- **/
-gboolean modest_ui_actions_on_delete_account (GtkWindow *parent_window,
-                                             const gchar *account_name,
-                                             const gchar *account_display_name);

 
 G_END_DECLS
 #endif /* __MODEST_UI_ACTIONS_H__ */
 
 G_END_DECLS
 #endif /* __MODEST_UI_ACTIONS_H__ */