#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"
-<<<<<<< .working
-#include <tny-stream-cache.h>
-=======
#include "modest-protocol-registry.h"
#include <tny-stream-cache.h>
->>>>>>> .merge-right.r5668
G_BEGIN_DECLS
**/
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:
**/
ModestWindowMgr* modest_singletons_get_window_mgr (ModestSingletons *self);
-<<<<<<< .working
-/**
- * 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_protocol_registry:
* @self:
*/
ModestPluginFactory* modest_singletons_get_plugin_factory (ModestSingletons *self);
->>>>>>> .merge-right.r5668
G_END_DECLS
#endif /* __MODEST_SINGLETONS_H__ */