Rename camel_service_get_settings().

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

diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 5d95e5c..1ce6bb8 100644 (file)
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -149,7 +149,7 @@ imap_store_update_store_flags (CamelStore *store)
         *     to take effect. */
 
        service = CAMEL_SERVICE (store);
-       settings = camel_service_get_settings (service);
+       settings = camel_service_ref_settings (service);
        imap_settings = CAMEL_IMAP_SETTINGS (settings);
 
        real_path = camel_imap_settings_dup_real_junk_path (imap_settings);
@@ -174,6 +174,8 @@ imap_store_update_store_flags (CamelStore *store)
                store->flags |= CAMEL_STORE_VTRASH;
 
        g_free (real_path);
+
+       g_object_unref (settings);
 }
 
 static void
@@ -300,12 +302,14 @@ connect_to_server (CamelService *service,
        if (tcp_stream == NULL)
                return FALSE;
 
-       settings = camel_service_get_settings (service);
+       settings = camel_service_ref_settings (service);
 
        network_settings = CAMEL_NETWORK_SETTINGS (settings);
        host = camel_network_settings_dup_host (network_settings);
        method = camel_network_settings_get_security_method (network_settings);
 
+       g_object_unref (settings);
+
        store->ostream = tcp_stream;
        store->istream = camel_stream_buffer_new (tcp_stream, CAMEL_STREAM_BUFFER_READ);
 
@@ -526,13 +530,16 @@ connect_to_server_process (CamelService *service,
 
        password = camel_service_get_password (service);
        provider = camel_service_get_provider (service);
-       settings = camel_service_get_settings (service);
+
+       settings = camel_service_ref_settings (service);
 
        network_settings = CAMEL_NETWORK_SETTINGS (settings);
        host = camel_network_settings_dup_host (network_settings);
        port = camel_network_settings_get_port (network_settings);
        user = camel_network_settings_dup_user (network_settings);
 
+       g_object_unref (settings);
+
        camel_url_set_protocol (&url, provider->protocol);
        camel_url_set_host (&url, host);
        camel_url_set_port (&url, port);
@@ -678,12 +685,15 @@ connect_to_server_wrapper (CamelService *service,
        gboolean use_shell_command;
        gboolean success;
 
-       settings = camel_service_get_settings (service);
+       settings = camel_service_ref_settings (service);
+
        shell_command = camel_imap_settings_dup_shell_command (
                CAMEL_IMAP_SETTINGS (settings));
        use_shell_command = camel_imap_settings_get_use_shell_command (
                CAMEL_IMAP_SETTINGS (settings));
 
+       g_object_unref (settings);
+
 #ifndef G_OS_WIN32
        if (use_shell_command && shell_command != NULL)
                success = connect_to_server_process (
@@ -713,12 +723,15 @@ imap_auth_loop (CamelService *service,
        gboolean success = TRUE;
 
        session = camel_service_get_session (service);
-       settings = camel_service_get_settings (service);
+
+       settings = camel_service_ref_settings (service);
 
        network_settings = CAMEL_NETWORK_SETTINGS (settings);
        host = camel_network_settings_dup_host (network_settings);
        mechanism = camel_network_settings_dup_auth_mechanism (network_settings);
 
+       g_object_unref (settings);
+
        if (store->preauthed) {
                if (camel_verbose_debug)
                        fprintf(stderr, "Server %s has preauthenticated us.\n",
@@ -799,12 +812,14 @@ imap_store_get_name (CamelService *service,
        gchar *user;
        gchar *name;
 
-       settings = camel_service_get_settings (service);
+       settings = camel_service_ref_settings (service);
 
        network_settings = CAMEL_NETWORK_SETTINGS (settings);
        host = camel_network_settings_dup_host (network_settings);
        user = camel_network_settings_dup_user (network_settings);
 
+       g_object_unref (settings);
+
        if (brief)
                name = g_strdup_printf (
                        _("IMAP server %s"), host);
@@ -832,9 +847,6 @@ imap_store_connect_sync (CamelService *service,
        const gchar *namespace;
        GError *local_error = NULL;
 
-       settings = camel_service_get_settings (service);
-       imap_settings = CAMEL_IMAP_SETTINGS (settings);
-
        if (!camel_offline_store_get_online (CAMEL_OFFLINE_STORE (store)))
                return TRUE;
 
@@ -849,6 +861,9 @@ imap_store_connect_sync (CamelService *service,
                return FALSE;
        }
 
+       settings = camel_service_ref_settings (service);
+       imap_settings = CAMEL_IMAP_SETTINGS (settings);
+
        /* Get namespace and hierarchy separator */
        if (store->capabilities & IMAP_CAPABILITY_NAMESPACE) {
                struct _namespaces *namespaces;
@@ -1014,6 +1029,8 @@ imap_store_connect_sync (CamelService *service,
        }
 
 done:
+       g_object_unref (settings);
+
        /* save any changes we had */
        camel_store_summary_save ((CamelStoreSummary *) store->summary);
 
@@ -1041,9 +1058,6 @@ imap_store_disconnect_sync (CamelService *service,
        CamelSettings *settings;
        CamelImapSettings *imap_settings;
 
-       settings = camel_service_get_settings (service);
-       imap_settings = CAMEL_IMAP_SETTINGS (settings);
-
        if (camel_offline_store_get_online (CAMEL_OFFLINE_STORE (store)) && clean) {
                CamelImapResponse *response;
 
@@ -1078,9 +1092,14 @@ imap_store_disconnect_sync (CamelService *service,
 
        g_hash_table_remove_all (store->known_alerts);
 
+       settings = camel_service_ref_settings (service);
+       imap_settings = CAMEL_IMAP_SETTINGS (settings);
+
        if (camel_imap_settings_get_use_namespace (imap_settings))
                camel_imap_settings_set_namespace (imap_settings, NULL);
 
+       g_object_unref (settings);
+
        return TRUE;
 }
 
@@ -1106,11 +1125,14 @@ imap_store_authenticate_sync (CamelService *service,
                gchar *user;
 
                password = camel_service_get_password (service);
-               settings = camel_service_get_settings (service);
+
+               settings = camel_service_ref_settings (service);
 
                network_settings = CAMEL_NETWORK_SETTINGS (settings);
                user = camel_network_settings_dup_user (network_settings);
 
+               g_object_unref (settings);
+
                if (user == NULL) {
                        g_set_error_literal (
                                error, CAMEL_SERVICE_ERROR,
@@ -1756,9 +1778,10 @@ imap_store_get_trash_folder_sync (CamelStore *store,
        gchar *trash_path;
 
        service = CAMEL_SERVICE (store);
-       settings = camel_service_get_settings (service);
        user_cache_dir = camel_service_get_user_cache_dir (service);
 
+       settings = camel_service_ref_settings (service);
+
        trash_path = camel_imap_settings_dup_real_trash_path (
                CAMEL_IMAP_SETTINGS (settings));
        if (trash_path != NULL) {
@@ -1770,6 +1793,8 @@ imap_store_get_trash_folder_sync (CamelStore *store,
        }
        g_free (trash_path);
 
+       g_object_unref (settings);
+
        if (folder)
                return folder;
 
@@ -1804,9 +1829,10 @@ imap_store_get_junk_folder_sync (CamelStore *store,
        gchar *junk_path;
 
        service = CAMEL_SERVICE (store);
-       settings = camel_service_get_settings (service);
        user_cache_dir = camel_service_get_user_cache_dir (service);
 
+       settings = camel_service_ref_settings (service);
+
        junk_path = camel_imap_settings_dup_real_junk_path (
                CAMEL_IMAP_SETTINGS (settings));
        if (junk_path != NULL) {
@@ -1818,6 +1844,8 @@ imap_store_get_junk_folder_sync (CamelStore *store,
        }
        g_free (junk_path);
 
+       g_object_unref (settings);
+
        if (folder)
                return folder;
 
@@ -2360,12 +2388,15 @@ imap_store_rename_folder_sync (CamelStore *store,
        gboolean success = TRUE;
 
        service = CAMEL_SERVICE (store);
-       settings = camel_service_get_settings (service);
        user_cache_dir = camel_service_get_user_cache_dir (service);
 
+       settings = camel_service_ref_settings (service);
+
        use_subscriptions = camel_imap_settings_get_use_subscriptions (
                CAMEL_IMAP_SETTINGS (settings));
 
+       g_object_unref (settings);
+
        if (!camel_imap_store_connected (imap_store, error)) {
                success = FALSE;
                goto fail;
@@ -2914,11 +2945,14 @@ refresh_refresh (CamelSession *session,
        gchar *namespace;
 
        service = CAMEL_SERVICE (store);
-       settings = camel_service_get_settings (service);
+
+       settings = camel_service_ref_settings (service);
 
        namespace = camel_imap_settings_dup_namespace (
                CAMEL_IMAP_SETTINGS (settings));
 
+       g_object_unref (settings);
+
        camel_operation_push_message (cancellable,
                _("Retrieving list of folders at '%s'"),
                camel_service_get_display_name (service));
@@ -3059,7 +3093,8 @@ get_folder_info_offline (CamelStore *store,
                printf("get folder info offline\n");
 
        service = CAMEL_SERVICE (store);
-       settings = camel_service_get_settings (service);
+
+       settings = camel_service_ref_settings (service);
 
        use_subscriptions = camel_imap_settings_get_use_subscriptions (
                CAMEL_IMAP_SETTINGS (settings));
@@ -3067,13 +3102,15 @@ get_folder_info_offline (CamelStore *store,
        junk_path = camel_imap_settings_dup_real_junk_path (
                CAMEL_IMAP_SETTINGS (settings));
 
+       trash_path = camel_imap_settings_dup_real_trash_path (
+               CAMEL_IMAP_SETTINGS (settings));
+
+       g_object_unref (settings);
+
        /* So we can safely compare strings. */
        if (junk_path == NULL)
                junk_path = g_strdup ("");
 
-       trash_path = camel_imap_settings_dup_real_trash_path (
-               CAMEL_IMAP_SETTINGS (settings));
-
        /* So we can safely compare strings. */
        if (trash_path == NULL)
                trash_path = g_strdup ("");
@@ -3309,7 +3346,8 @@ imap_can_refresh_folder (CamelStore *store,
        GError *local_error = NULL;
 
        service = CAMEL_SERVICE (store);
-       settings = camel_service_get_settings (service);
+
+       settings = camel_service_ref_settings (service);
 
        check_all = camel_imap_settings_get_check_all (
                CAMEL_IMAP_SETTINGS (settings));
@@ -3317,6 +3355,8 @@ imap_can_refresh_folder (CamelStore *store,
        check_subscribed = camel_imap_settings_get_check_subscribed (
                CAMEL_IMAP_SETTINGS (settings));
 
+       g_object_unref (settings);
+
        subscribed = ((info->flags & CAMEL_FOLDER_SUBSCRIBED) != 0);
 
        res = CAMEL_STORE_CLASS (camel_imap_store_parent_class)->