Rename camel_service_get_settings().

[platform/upstream/evolution-data-server.git] / camel / providers / smtp / camel-smtp-transport.c

diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 8903681..d2e15e8 100644 (file)
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -117,12 +117,14 @@ connect_to_server (CamelService *service,
        transport->flags = 0;
        transport->authtypes = NULL;
 
-       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);
+
        tcp_stream = camel_network_service_connect_sync (
                CAMEL_NETWORK_SERVICE (service), cancellable, error);
 
@@ -284,11 +286,13 @@ smtp_transport_get_name (CamelService *service,
        gchar *host;
        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);
 
+       g_object_unref (settings);
+
        if (brief)
                name = g_strdup_printf (
                        _("SMTP server %s"), host);
@@ -314,12 +318,14 @@ smtp_transport_connect_sync (CamelService *service,
        gboolean auth_required;
        gboolean success = TRUE;
 
-       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);
+
        /* We (probably) need to check popb4smtp before we connect ... */
        if (g_strcmp0 (mechanism, "POPB4SMTP") == 0) {
                GByteArray *chal;