From df8d6d045bb5be369a116a9706f8c17227fafb82 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 Nov 2013 10:48:04 -0500 Subject: Use plain SoupSesson everywhere. SoupSessionAsync and SoupSessionSync are deprecated in libsoup 2.42. --- calendar/gui/e-meeting-store.c | 2 +- calendar/gui/itip-utils.c | 2 +- mail/e-http-request.c | 5 ++--- mail/e-mail-autoconfig.c | 2 +- modules/cal-config-caldav/e-caldav-chooser.c | 4 ++-- modules/gravatar/e-gravatar-photo-source.c | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index 4e749f13d7..3b7a772117 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -2018,7 +2018,7 @@ download_with_libsoup (const gchar *uri, g_object_set_data_full (G_OBJECT (msg), "orig-uri", g_strdup (uri), g_free); - session = soup_session_async_new (); + session = soup_session_new (); g_object_set (session, SOUP_SESSION_TIMEOUT, 90, NULL); g_signal_connect ( session, "authenticate", diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 4a18a145cf..819fc897c3 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -2181,7 +2181,7 @@ itip_publish_comp (ECalClient *cal_client, icalcomponent_add_component (toplevel, icomp); /* Publish the component */ - session = soup_session_async_new (); + session = soup_session_new (); g_object_set (session, SOUP_SESSION_TIMEOUT, 90, NULL); proxy = e_proxy_new (); diff --git a/mail/e-http-request.c b/mail/e-http-request.c index 49cdf6058e..d6dd52cde4 100644 --- a/mail/e-http-request.c +++ b/mail/e-http-request.c @@ -352,9 +352,8 @@ handle_http_request (GSimpleAsyncResult *res, context = g_main_context_new (); g_main_context_push_thread_default (context); - session = soup_session_sync_new_with_options ( - SOUP_SESSION_TIMEOUT, 90, - NULL); + session = soup_session_new_with_options ( + SOUP_SESSION_TIMEOUT, 90, NULL); proxy = e_proxy_new (); e_proxy_setup_proxy (proxy); diff --git a/mail/e-mail-autoconfig.c b/mail/e-mail-autoconfig.c index ca0b96405f..72a627b6d5 100644 --- a/mail/e-mail-autoconfig.c +++ b/mail/e-mail-autoconfig.c @@ -379,7 +379,7 @@ mail_autoconfig_lookup (EMailAutoconfig *autoconfig, gchar *uri; EProxy *proxy; - soup_session = soup_session_sync_new (); + soup_session = soup_session_new (); uri = g_strconcat (AUTOCONFIG_BASE_URI, domain, NULL); diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c index 99017b8120..ee18411329 100644 --- a/modules/cal-config-caldav/e-caldav-chooser.c +++ b/modules/cal-config-caldav/e-caldav-chooser.c @@ -1307,7 +1307,7 @@ caldav_chooser_constructed (GObject *object) G_OBJECT_CLASS (e_caldav_chooser_parent_class)->constructed (object); chooser = E_CALDAV_CHOOSER (object); - session = soup_session_async_new (); + session = soup_session_new (); caldav_chooser_configure_session (chooser, session); chooser->priv->session = session; @@ -1390,7 +1390,7 @@ caldav_chooser_try_password_sync (ESourceAuthenticator *auth, /* Create our own SoupSession so we * can try the password synchronously. */ - session = soup_session_sync_new (); + session = soup_session_new (); caldav_chooser_configure_session (chooser, session); source = e_caldav_chooser_get_source (chooser); diff --git a/modules/gravatar/e-gravatar-photo-source.c b/modules/gravatar/e-gravatar-photo-source.c index b41c689712..18a49e029f 100644 --- a/modules/gravatar/e-gravatar-photo-source.c +++ b/modules/gravatar/e-gravatar-photo-source.c @@ -81,7 +81,7 @@ gravatar_photo_source_get_photo_thread (GSimpleAsyncResult *simple, g_debug ("Requesting avatar for %s", async_context->email_address); g_debug ("%s", uri); - session = soup_session_sync_new (); + session = soup_session_new (); proxy = e_proxy_new (); e_proxy_setup_proxy (proxy); -- cgit v1.2.3