From 8c4d399bb8f14bcb599a41ccc56ac5bc585db0b2 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Thu, 23 Apr 2009 09:33:51 +0000 Subject: [PATCH] * Added a new proxy method for accessing runtime singletons * Added some header files to export * Fixed several #include statements pmo-trunk-r9068 --- src/Makefile.am | 6 +++++- src/export.map | 3 +++ src/hildon2/modest-hildon2-window-mgr.c | 1 + src/modest-mail-operation.h | 1 - src/modest-plugin.c | 7 +++++++ src/modest-plugin.h | 3 ++- src/widgets/Makefile.am | 1 + src/widgets/modest-header-view.h | 1 + src/widgets/modest-hildon1-window-mgr.h | 3 +-- src/widgets/modest-window-mgr.h | 2 +- 10 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d1b1418..b720850 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,7 @@ INCLUDES=\ $(MODEST_LIBCONIC_CFLAGS) \ $(MODEST_HILDON_NOTIFY_CFLAGS) \ $(MODEST_MOZEMBED_CFLAGS) \ - -fPIC \ + -fPIC \ -I$(MODEST_TOOLKIT_DIR) \ -DPREFIX=\"@prefix@\" \ -DMAEMO_CHANGES \ @@ -53,6 +53,8 @@ modest_public_headers = \ modest-conf.h \ modest-defs.h \ modest-local-folder-info.h \ + modest-mail-operation.h \ + modest-mail-operation-queue.h \ modest-pair.h \ modest-platform.h \ modest-plugin.h \ @@ -60,10 +62,12 @@ modest_public_headers = \ modest-protocol.h \ modest-protocol-registry.h \ modest-server-account-settings.h \ + modest-signal-mgr.h \ modest-text-utils.h \ modest-tny-account-store.h \ modest-tny-folder.h \ modest-tny-local-folders-account.h \ + modest-tny-send-queue.h \ modest-utils.h libmodest_la_SOURCES=\ diff --git a/src/export.map b/src/export.map index 31dc8ad..6acee2d 100644 --- a/src/export.map +++ b/src/export.map @@ -25,10 +25,13 @@ modest_conf_*; modest_easysetup_wizard_*; modest_pair_*; + modest_mail_operation_get_source; + modest_mail_operation_get_type_operation; modest_platform_*; modest_plugin_*; modest_protocol_*; modest_server_account_settings_*; + modest_signal_mgr_*; modest_validating_entry_*; modest_ui_actions_*; modest_wizard_dialog_*; diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c index 2b05222..c007e0f 100644 --- a/src/hildon2/modest-hildon2-window-mgr.c +++ b/src/hildon2/modest-hildon2-window-mgr.c @@ -29,6 +29,7 @@ #include #include +#include "modest-hildon2-window.h" #include "modest-hildon2-window-mgr.h" #include "modest-msg-edit-window.h" #include "modest-mailboxes-window.h" diff --git a/src/modest-mail-operation.h b/src/modest-mail-operation.h index 997104b..f3e17ee 100644 --- a/src/modest-mail-operation.h +++ b/src/modest-mail-operation.h @@ -32,7 +32,6 @@ #include #include -#include #include #include diff --git a/src/modest-plugin.c b/src/modest-plugin.c index a6f47e7..f0d246c 100644 --- a/src/modest-plugin.c +++ b/src/modest-plugin.c @@ -92,6 +92,13 @@ modest_plugin_get_protocol_registry (void) return modest_runtime_get_protocol_registry (); } +ModestMailOperationQueue * +modest_plugin_get_mail_operation_queue (void) +{ + /* This is for avoiding including modest runtime itself */ + return modest_runtime_get_mail_operation_queue (); +} + const gchar * modest_plugin_get_api_version (ModestPlugin *plugin) { diff --git a/src/modest-plugin.h b/src/modest-plugin.h index 54c5f8c..46f45a6 100644 --- a/src/modest-plugin.h +++ b/src/modest-plugin.h @@ -33,6 +33,7 @@ #include #include #include +#include #define MODEST_API_VERSION_STR2_HELPER(x) #x #define MODEST_API_VERSION_STR_HELPER(x) MODEST_API_VERSION_STR2_HELPER(x) @@ -120,8 +121,8 @@ register_modest_plugin (GTypeModule *module) \ /* Global methods providing access to singletons without using modest runtime */ ModestAccountMgr *modest_plugin_get_account_mgr (void); ModestProtocolRegistry *modest_plugin_get_protocol_registry (void); +ModestMailOperationQueue *modest_plugin_get_mail_operation_queue (void); const gchar *modest_plugin_get_api_version (ModestPlugin *plugin); - G_END_DECLS #endif /* __MODEST_PLUGIN_H__ */ diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am index 7bab572..a40d264 100644 --- a/src/widgets/Makefile.am +++ b/src/widgets/Makefile.am @@ -28,6 +28,7 @@ libmodest_widgets_public_headers = \ modest-ui-constants.h \ modest-validating-entry.h \ modest-window.h \ + modest-window-mgr.h \ modest-wizard-dialog.h diff --git a/src/widgets/modest-header-view.h b/src/widgets/modest-header-view.h index f0d7bfc..0b23c59 100644 --- a/src/widgets/modest-header-view.h +++ b/src/widgets/modest-header-view.h @@ -36,6 +36,7 @@ #include #include #include +#include "modest-window.h" #include "modest-mail-operation.h" #include "modest-header-view-observer.h" diff --git a/src/widgets/modest-hildon1-window-mgr.h b/src/widgets/modest-hildon1-window-mgr.h index b7dcbdd..f712d97 100644 --- a/src/widgets/modest-hildon1-window-mgr.h +++ b/src/widgets/modest-hildon1-window-mgr.h @@ -31,8 +31,7 @@ #define __MODEST_HILDON1_WINDOW_MGR_H__ #include -#include "widgets/modest-window-mgr.h" -#include "widgets/modest-msg-view-window.h" +#include "modest-window-mgr.h" G_BEGIN_DECLS diff --git a/src/widgets/modest-window-mgr.h b/src/widgets/modest-window-mgr.h index d5eece0..ca22f62 100644 --- a/src/widgets/modest-window-mgr.h +++ b/src/widgets/modest-window-mgr.h @@ -31,7 +31,7 @@ #define __MODEST_WINDOW_MGR_H__ #include -#include "widgets/modest-msg-view-window.h" +#include "modest-window.h" G_BEGIN_DECLS -- 1.7.9.5