Fix plugin api, so that it includes all the new required headers.

pmo-trunk-r7597

diff --git a/src/Makefile.am b/src/Makefile.am
index a9977a2..0167522 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,6 +55,8 @@ modest_public_headers = \
        modest-account-settings.h \
        modest-cache-mgr.h \
        modest-conf.h \
        modest-account-settings.h \
        modest-cache-mgr.h \
        modest-conf.h \

+       modest-defs.h \
+       modest-local-folder-info.h \

        modest-pair.h \
        modest-platform.h \
        modest-plugin.h \
        modest-pair.h \
        modest-platform.h \
        modest-plugin.h \

@@ -64,6 +66,7 @@ modest_public_headers = \
        modest-server-account-settings.h \
        modest-text-utils.h \
        modest-tny-account-store.h \
        modest-server-account-settings.h \
        modest-text-utils.h \
        modest-tny-account-store.h \

+       modest-tny-folder.h \

        modest-tny-local-folders-account.h \
        modest-utils.h
 
        modest-tny-local-folders-account.h \
        modest-utils.h
 

@@ -82,7 +85,6 @@ libmodest_la_SOURCES=\
        modest-datetime-formatter.c \
        modest-datetime-formatter.h \
        modest-debug.h \
        modest-datetime-formatter.c \
        modest-datetime-formatter.h \
        modest-debug.h \

-       modest-defs.h \

        modest-defs.c \
        modest-dimming-rule.c \
        modest-dimming-rule.h \
        modest-defs.c \
        modest-dimming-rule.c \
        modest-dimming-rule.h \

@@ -96,7 +98,6 @@ libmodest_la_SOURCES=\
        modest-init.c \
        modest-init.h \
        modest-local-folder-info.c \
        modest-init.c \
        modest-init.h \
        modest-local-folder-info.c \

-       modest-local-folder-info.h \

        modest-mail-operation-queue.c \
        modest-mail-operation-queue.h \
        modest-mail-operation.c \
        modest-mail-operation-queue.c \
        modest-mail-operation-queue.h \
        modest-mail-operation.c \

@@ -129,7 +130,6 @@ libmodest_la_SOURCES=\
        modest-tny-account.c \
        modest-tny-account.h \
        modest-tny-folder.c \
        modest-tny-account.c \
        modest-tny-account.h \
        modest-tny-folder.c \

-       modest-tny-folder.h \

        modest-tny-local-folders-account.c \
        modest-tny-mime-part.c \
        modest-tny-mime-part.h \
        modest-tny-local-folders-account.c \
        modest-tny-mime-part.c \
        modest-tny-mime-part.h \

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index 8f037cc..39d9466 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -40,6 +40,7 @@
 #include "widgets/modest-msg-edit-window.h"
 #include "modest-tny-msg.h"
 #include "modest-platform.h"
 #include "widgets/modest-msg-edit-window.h"
 #include "modest-tny-msg.h"
 #include "modest-platform.h"

+#include "modest-defs.h"

 #include <libmodest-dbus-client/libmodest-dbus-client.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <stdio.h>
 #include <libmodest-dbus-client/libmodest-dbus-client.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <stdio.h>

diff --git a/src/export.map b/src/export.map
index 2c446c6..56ec90a 100644 (file)
--- a/src/export.map
+++ b/src/export.map
@@ -21,6 +21,7 @@
        modest_account_settings_*;
        modest_account_mgr_*;
        modest_account_protocol_*;
        modest_account_settings_*;
        modest_account_mgr_*;
        modest_account_protocol_*;

+       modest_defs_*

        modest_conf_*;
        modest_easysetup_wizard_*;
        modest_pair_*;
        modest_conf_*;
        modest_easysetup_wizard_*;
        modest_pair_*;

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index 87d63d8..fb14371 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -31,6 +31,7 @@
 #include <glib/gi18n.h>
 
 #include <modest-platform.h>
 #include <glib/gi18n.h>
 
 #include <modest-platform.h>

+#include <modest-defs.h>

 #include <modest-runtime.h>
 #include <modest-main-window.h>
 #include <modest-header-view.h>
 #include <modest-runtime.h>
 #include <modest-main-window.h>
 #include <modest-header-view.h>

diff --git a/src/modest-local-folder-info.c b/src/modest-local-folder-info.c
index c818cca..7f6a08c 100644 (file)
--- a/src/modest-local-folder-info.c
+++ b/src/modest-local-folder-info.c
@@ -30,6 +30,7 @@
 #include <glib/gi18n.h>
 #include <string.h> /* strcmp */
 #include <modest-local-folder-info.h>
 #include <glib/gi18n.h>
 #include <string.h> /* strcmp */
 #include <modest-local-folder-info.h>

+#include <modest-defs.h>

 #include <stdio.h>
 
 typedef struct {
 #include <stdio.h>
 
 typedef struct {

diff --git a/src/modest-local-folder-info.h b/src/modest-local-folder-info.h
index 8dcae52..39da254 100644 (file)
--- a/src/modest-local-folder-info.h
+++ b/src/modest-local-folder-info.h
@@ -33,7 +33,6 @@
 G_BEGIN_DECLS
 
 #include <glib.h>
 G_BEGIN_DECLS
 
 #include <glib.h>

-#include <modest-defs.h>

 #include <tny-folder.h>
 
 /**
 #include <tny-folder.h>
 
 /**

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 39d1629..d1a0e13 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -45,6 +45,7 @@
 #include <tny-folder-observer.h>
 #include <camel/camel-stream-mem.h>
 #include <glib/gi18n.h>
 #include <tny-folder-observer.h>
 #include <camel/camel-stream-mem.h>
 #include <glib/gi18n.h>

+#include <modest-defs.h>

 #include "modest-platform.h"
 #include "modest-account-mgr-helpers.h"
 #include <modest-tny-account.h>
 #include "modest-platform.h"
 #include "modest-account-mgr-helpers.h"
 #include <modest-tny-account.h>

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index c8fa339..31eab5a 100644 (file)
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -28,6 +28,7 @@
  */
 
 #include <modest-platform.h>
  */
 
 #include <modest-platform.h>

+#include <modest-defs.h>

 #include <modest-tny-platform-factory.h>
 #include <modest-tny-account.h>
 #include <modest-tny-account-store.h>
 #include <modest-tny-platform-factory.h>
 #include <modest-tny-account.h>
 #include <modest-tny-account-store.h>

diff --git a/src/modest-tny-folder.c b/src/modest-tny-folder.c
index 28012c3..ee0f224 100644 (file)
--- a/src/modest-tny-folder.c
+++ b/src/modest-tny-folder.c
@@ -30,6 +30,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <string.h>

+#include <modest-defs.h>

 #include <modest-tny-folder.h>
 #include <modest-tny-account.h>
 #include <modest-tny-outbox-account.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-account.h>
 #include <modest-tny-outbox-account.h>

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index abdcf44..797c03f 100644 (file)
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -33,6 +33,7 @@
 #include <tny-simple-list.h>
 #include <tny-folder.h>
 #include <modest-runtime.h>
 #include <tny-simple-list.h>
 #include <tny-folder.h>
 #include <modest-runtime.h>

+#include <modest-defs.h>

 #include "modest-formatter.h"
 #include <tny-camel-mem-stream.h>
 #include <tny-camel-mime-part.h>
 #include "modest-formatter.h"
 #include <tny-camel-mem-stream.h>
 #include <tny-camel-mime-part.h>

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 24a70d2..0bf384b 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -35,6 +35,7 @@
 #include <glib/gprintf.h>
 #include <string.h>
 #include <modest-runtime.h>
 #include <glib/gprintf.h>
 #include <string.h>
 #include <modest-runtime.h>

+#include <modest-defs.h>

 #include <modest-tny-folder.h>
 #include <modest-tny-msg.h>
 #include <modest-tny-account.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-msg.h>
 #include <modest-tny-account.h>

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 8ad2bb9..a5fba5e 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -27,6 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 

+#include <modest-defs.h>

 #include <modest-widget-memory.h>
 #include <modest-widget-memory-priv.h>
 #include <modest-runtime.h>
 #include <modest-widget-memory.h>
 #include <modest-widget-memory-priv.h>
 #include <modest-runtime.h>

diff --git a/src/widgets/modest-compact-mail-header-view.c b/src/widgets/modest-compact-mail-header-view.c
index b0849b2..bf6c7d4 100644 (file)
--- a/src/widgets/modest-compact-mail-header-view.c
+++ b/src/widgets/modest-compact-mail-header-view.c
@@ -32,6 +32,7 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
 
 #include <string.h>
 #include <gtk/gtk.h>

+#include <modest-defs.h>

 #include <modest-text-utils.h>
 #include <modest-compact-mail-header-view.h>
 #include <modest-tny-folder.h>
 #include <modest-text-utils.h>
 #include <modest-compact-mail-header-view.h>
 #include <modest-tny-folder.h>

diff --git a/src/widgets/modest-expander-mail-header-view.c b/src/widgets/modest-expander-mail-header-view.c
index 8a7c3d9..d5258ff 100644 (file)
--- a/src/widgets/modest-expander-mail-header-view.c
+++ b/src/widgets/modest-expander-mail-header-view.c
@@ -32,6 +32,7 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
 
 #include <string.h>
 #include <gtk/gtk.h>

+#include <modest-defs.h>

 #include <modest-text-utils.h>
 #include <modest-expander-mail-header-view.h>
 #include <modest-tny-folder.h>
 #include <modest-text-utils.h>
 #include <modest-expander-mail-header-view.h>
 #include <modest-tny-folder.h>

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index be66797..3b151e0 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -44,6 +44,7 @@
 #include <tny-camel-folder.h>
 #include <tny-simple-list.h>
 #include <tny-camel-account.h>
 #include <tny-camel-folder.h>
 #include <tny-simple-list.h>
 #include <tny-camel-account.h>

+#include <modest-defs.h>

 #include <modest-tny-account.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-local-folders-account.h>
 #include <modest-tny-account.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-local-folders-account.h>

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index 825ada5..b55c9d0 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -30,6 +30,7 @@
 #include <tny-simple-list.h>
 #include <modest-header-view.h>
 #include <modest-header-view-priv.h>
 #include <tny-simple-list.h>
 #include <modest-header-view.h>
 #include <modest-header-view-priv.h>

+#include <modest-defs.h>

 #include <modest-icon-names.h>
 #include <modest-text-utils.h>
 #include <modest-tny-account-store.h>
 #include <modest-icon-names.h>
 #include <modest-text-utils.h>
 #include <modest-tny-account-store.h>