Changes for hildon2 port.

[modest] / src / modest-singletons.c

diff --git a/src/modest-singletons.c b/src/modest-singletons.c
index 28f50a1..1883f20 100644 (file)
--- a/src/modest-singletons.c
+++ b/src/modest-singletons.c
@@ -48,13 +48,9 @@ struct _ModestSingletonsPrivate {
        TnyPlatformFactory        *platform_fact;
        TnyDevice                 *device;
        ModestWindowMgr           *window_mgr;
-<<<<<<< .working
-       TnyStreamCache            *images_cache;
-=======
        ModestProtocolRegistry    *protocol_registry;
        ModestPluginFactory   *plugin_factory;
        TnyStreamCache            *images_cache;
->>>>>>> .merge-right.r5668
 };
 #define MODEST_SINGLETONS_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                MODEST_TYPE_SINGLETONS, \
@@ -113,9 +109,6 @@ modest_singletons_init (ModestSingletons *obj)
        priv->platform_fact   = NULL;
        priv->device          = NULL;
        priv->window_mgr      = NULL;
-<<<<<<< .working
-       priv->images_cache    = NULL;
-=======
        priv->protocol_registry = NULL;
        priv->plugin_factory = NULL;
 
@@ -126,7 +119,6 @@ modest_singletons_init (ModestSingletons *obj)
        }
        modest_protocol_registry_set_to_default (priv->protocol_registry);
        priv->images_cache    = NULL;
->>>>>>> .merge-right.r5668
        
        priv->conf           = modest_conf_new ();
        if (!priv->conf) {
@@ -175,16 +167,6 @@ modest_singletons_init (ModestSingletons *obj)
                g_printerr ("modest: cannot create modest window manager instance\n");
                return;
        }
-<<<<<<< .working
-
-       images_cache_path = g_build_filename (g_get_home_dir (), MODEST_DIR, MODEST_IMAGES_CACHE_DIR, NULL);
-       priv->images_cache = tny_fs_stream_cache_new (images_cache_path, MODEST_IMAGES_CACHE_SIZE);
-       g_free (images_cache_path);
-       if (!priv->images_cache) {
-               g_printerr ("modest: cannot create images cache instance\n");
-               return;
-       }
-=======
 
        priv->plugin_factory = modest_plugin_factory_new ();
        if (!priv->plugin_factory) {
@@ -200,7 +182,6 @@ modest_singletons_init (ModestSingletons *obj)
                return;
        }
 
->>>>>>> .merge-right.r5668
 }
 
 static void
@@ -358,15 +339,6 @@ modest_singletons_get_window_mgr (ModestSingletons *self)
        g_return_val_if_fail (self, NULL);
        return MODEST_SINGLETONS_GET_PRIVATE(self)->window_mgr;
 }
-<<<<<<< .working
-
-TnyStreamCache* 
-modest_singletons_get_images_cache (ModestSingletons *self)
-{
-       g_return_val_if_fail (self, NULL);
-       return MODEST_SINGLETONS_GET_PRIVATE(self)->images_cache;
-}
-=======
 
 ModestProtocolRegistry* 
 modest_singletons_get_protocol_registry (ModestSingletons *self)
@@ -389,4 +361,3 @@ modest_singletons_get_plugin_factory (ModestSingletons *self)
 
        return MODEST_SINGLETONS_GET_PRIVATE (self)->plugin_factory;
 }
->>>>>>> .merge-right.r5668