Rename camel_service_get_settings().

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

diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index db00da6..d589941 100644 (file)
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -89,11 +89,14 @@ maildir_store_create_folder_sync (CamelStore *store,
        /* This is a pretty hacky version of create folder, but should basically work */
 
        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,
@@ -176,11 +179,14 @@ maildir_store_get_folder_sync (CamelStore *store,
        CamelFolder *folder = NULL;
 
        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);
+
        folder_name = md_canon_name (folder_name);
        dir_name = maildir_full_name_to_dir_name (folder_name);
 
@@ -303,11 +309,14 @@ maildir_store_delete_folder_sync (CamelStore *store,
        }
 
        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);
+
        /* maildir++ directory names start with a '.' */
        dir_name = maildir_full_name_to_dir_name (folder_name);
        name = g_build_filename (path, dir_name, NULL);
@@ -410,11 +419,14 @@ fill_fi (CamelStore *store,
                gchar *root;
 
                service = CAMEL_SERVICE (store);
-               settings = camel_service_get_settings (service);
+
+               settings = camel_service_ref_settings (service);
 
                local_settings = CAMEL_LOCAL_SETTINGS (settings);
                root = camel_local_settings_dup_path (local_settings);
 
+               g_object_unref (settings);
+
                /* This should be fast enough not to have to test for INFO_FAST */
                dir_name = maildir_full_name_to_dir_name (fi->full_name);
 
@@ -457,10 +469,14 @@ scan_fi (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);
+
        g_return_val_if_fail (path != NULL, NULL);
 
        fi = camel_folder_info_new ();
@@ -551,10 +567,14 @@ scan_dirs (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);
+
        g_return_val_if_fail (path != NULL, -1);
 
        folders = g_ptr_array_new ();
@@ -849,11 +869,14 @@ maildir_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);
+
        dir_name = maildir_full_name_to_dir_name (full_name);
        filename = g_build_filename (path, dir_name, NULL);
        g_free (dir_name);
@@ -877,11 +900,14 @@ maildir_get_meta_path (CamelLocalStore *ls,
        gchar *tmp;
 
        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);
+
        dir_name = maildir_full_name_to_dir_name (full_name);
        tmp = g_build_filename (path, dir_name, NULL);
        filename = g_strconcat (tmp, ext, NULL);
@@ -938,11 +964,14 @@ scan_old_dir_info (CamelStore *store,
        gint res = -1;
 
        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);
+
        visited = g_hash_table_new (scan_hash, scan_equal);
 
        sn = g_malloc0 (sizeof (*sn));