Rename camel_service_get_settings().

[platform/upstream/evolution-data-server.git] / camel / providers / local / camel-local-store.c

diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
index 48421a8..033d8e5 100644 (file)
--- a/camel/providers/local/camel-local-store.c
+++ b/camel/providers/local/camel-local-store.c
@@ -167,11 +167,13 @@ local_store_get_name (CamelService *service,
        gchar *path;
        gchar *name;
 
-       settings = camel_service_get_settings (service);
+       settings = camel_service_ref_settings (service);
 
        local_settings = CAMEL_LOCAL_SETTINGS (settings);
        path = camel_local_settings_dup_path (local_settings);
 
+       g_object_unref (settings);
+
        if (brief)
                name = g_strdup (path);
        else
@@ -206,11 +208,14 @@ local_store_get_folder_sync (CamelStore *store,
        gchar *path;
 
        service = CAMEL_SERVICE (store);
-       settings= camel_service_get_settings (service);
+
+       settings= camel_service_ref_settings (service);
 
        local_settings = CAMEL_LOCAL_SETTINGS (settings);
        path = camel_local_settings_dup_path (local_settings);
 
+       g_object_unref (settings);
+
        if (!g_path_is_absolute (path)) {
                g_set_error (
                        error, CAMEL_STORE_ERROR,
@@ -361,11 +366,14 @@ local_store_create_folder_sync (CamelStore *store,
        struct stat st;
 
        service = CAMEL_SERVICE (store);
-       settings = camel_service_get_settings (service);
+
+       settings = camel_service_ref_settings (service);
 
        local_settings = CAMEL_LOCAL_SETTINGS (settings);
        path = camel_local_settings_dup_path (local_settings);
 
+       g_object_unref (settings);
+
        /* This is a pretty hacky version of create folder, but should basically work */
 
        if (!g_path_is_absolute (path)) {
@@ -430,11 +438,14 @@ local_store_delete_folder_sync (CamelStore *store,
        gboolean success = TRUE;
 
        service = CAMEL_SERVICE (store);
-       settings = camel_service_get_settings (service);
+
+       settings = camel_service_ref_settings (service);
 
        local_settings = CAMEL_LOCAL_SETTINGS (settings);
        path = camel_local_settings_dup_path (local_settings);
 
+       g_object_unref (settings);
+
        /* remove metadata only */
        name = g_build_filename (path, folder_name, NULL);
        str = g_strdup_printf ("%s.ibex", name);
@@ -512,11 +523,14 @@ local_store_rename_folder_sync (CamelStore *store,
        gboolean success = TRUE;
 
        service = CAMEL_SERVICE (store);
-       settings = camel_service_get_settings (service);
+
+       settings = camel_service_ref_settings (service);
 
        local_settings = CAMEL_LOCAL_SETTINGS (settings);
        path = camel_local_settings_dup_path (local_settings);
 
+       g_object_unref (settings);
+
        old_basename = g_strdup_printf ("%s.ibex", old);
        new_basename = g_strdup_printf ("%s.ibex", new);
 
@@ -606,11 +620,14 @@ local_store_get_full_path (CamelLocalStore *ls,
        gchar *path;
 
        service = CAMEL_SERVICE (ls);
-       settings = camel_service_get_settings (service);
+
+       settings = camel_service_ref_settings (service);
 
        local_settings = CAMEL_LOCAL_SETTINGS (settings);
        path = camel_local_settings_dup_path (local_settings);
 
+       g_object_unref (settings);
+
        filename = g_build_filename (path, full_name, NULL);
 
        g_free (path);
@@ -631,11 +648,14 @@ local_store_get_meta_path (CamelLocalStore *ls,
        gchar *path;
 
        service = CAMEL_SERVICE (ls);
-       settings = camel_service_get_settings (service);
+
+       settings = camel_service_ref_settings (service);
 
        local_settings = CAMEL_LOCAL_SETTINGS (settings);
        path = camel_local_settings_dup_path (local_settings);
 
+       g_object_unref (settings);
+
        basename = g_strconcat (full_name, ext, NULL);
        filename = g_build_filename (path, basename, NULL);
        g_free (basename);