X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-singletons.h;h=76f95322dafd9e4924842cb97378a1b99018afb9;hb=3faeed1822d68733fd07100ba52cf99abea6d83e;hp=1c40a50e1e705179787c93b00f5c1c08b912773b;hpb=bf831b6566516e6b57de7a64afb732eb8686e792;p=modest

diff --git a/src/modest-singletons.h b/src/modest-singletons.h
index 1c40a50..76f95322 100644
--- a/src/modest-singletons.h
+++ b/src/modest-singletons.h
@@ -36,11 +36,14 @@
 #include <modest-conf.h>
 #include <modest-email-clipboard.h>
 #include <modest-account-mgr.h>
-#include <modest-tny-account-store.h>
 #include <modest-mail-operation-queue.h>
 #include <modest-cache-mgr.h>
 #include <modest-tny-platform-factory.h>
+#include <widgets/modest-toolkit-factory.h>
+#include "modest-plugin-factory.h"
 #include "widgets/modest-window-mgr.h"
+#include "modest-protocol-registry.h"
+#include <tny-stream-cache.h>
 
 G_BEGIN_DECLS
 
@@ -124,17 +127,6 @@ ModestAccountMgr*         modest_singletons_get_account_mgr   (ModestSingletons
  **/
 ModestEmailClipboard*      modest_singletons_get_email_clipboard (ModestSingletons *self);
 
-/**
- * modest_singletons_get_account_store:
- * @self: a valid #ModestSingletons instance
- * 
- * get the #ModestTnyAccountStore singleton instance
- * don't use this function directly, use the modest-runtime
- * functions instead.
- *
- * Returns: the #ModestTnyAccountStore singleton
- **/
-ModestTnyAccountStore*    modest_singletons_get_account_store (ModestSingletons *self);
 
 /**
  * modest_singletons_get_cache_mgr:
@@ -162,6 +154,18 @@ ModestCacheMgr*           modest_singletons_get_cache_mgr     (ModestSingletons
  **/
 TnyPlatformFactory*       modest_singletons_get_platform_factory  (ModestSingletons *self);
 
+/**
+ * modest_singletons_get_toolkit_factory:
+ * @self: a valid #ModestSingletons instance
+ * 
+ * get the #TnyToolkitFactory singleton instance
+ * don't use this function directly, use the modest-runtime
+ * functions instead.
+ *
+ * Returns: the #ModestToolkitFactory singleton
+ **/
+ModestToolkitFactory*       modest_singletons_get_toolkit_factory  (ModestSingletons *self);
+
 
 /**
  * modest_singletons_get_device:
@@ -199,6 +203,33 @@ ModestMailOperationQueue* modest_singletons_get_mail_operation_queue (ModestSing
  **/
 ModestWindowMgr*          modest_singletons_get_window_mgr           (ModestSingletons *self);
 
+/**
+ * modest_singletons_get_protocol_registry:
+ * @self: 
+ * 
+ * Gets the #ModestProtocolRegistry singleton instance. Don't use this
+ * function directly, use the modest-runtime function instead.
+ *
+ * Return value: the singleton instance of #ModestProtocolRegistry
+ **/
+ModestProtocolRegistry*          modest_singletons_get_protocol_registry           (ModestSingletons *self);
+
+/**
+ * modest_singletons_get_images_cache:
+ * @self: a #ModestSingletons
+ *
+ * Gets the #TnyStreamCache used to store the external images cache.
+ */
+TnyStreamCache*           modest_singletons_get_images_cache         (ModestSingletons *self);
+
+/**
+ * modest_singletons_get_plugin_factory:
+ * @self: a #ModestSingletons
+ *
+ * Gets the #ModestMailPluginFactory singleton.
+ */
+ModestPluginFactory*           modest_singletons_get_plugin_factory         (ModestSingletons *self);
+
 G_END_DECLS
 
 #endif /* __MODEST_SINGLETONS_H__ */