[rhythmbox] require libsoup 2.42 and switch to SoupSession

[Jonathan Matthew <jmatthew src gnome org>]

commit eef91d5edd4763246b51076936f44670ff3a39cf
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sat Jun 18 15:50:17 2016 +1000

    require libsoup 2.42 and switch to SoupSession

 configure.ac                                       |    2 +-
 plugins/audiocd/rb-musicbrainz-lookup.c            |   10 +++++-----
 plugins/audioscrobbler/rb-audioscrobbler-account.c |    6 +++---
 .../rb-audioscrobbler-radio-source.c               |    6 +++---
 plugins/audioscrobbler/rb-audioscrobbler-user.c    |    6 +++---
 plugins/audioscrobbler/rb-audioscrobbler.c         |    2 +-
 podcast/rb-podcast-search-itunes.c                 |    6 +++---
 podcast/rb-podcast-search-miroguide.c              |    6 +++---
 8 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3914a36..d37b15f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ GLIB_REQS=2.34.0
 LIBGPOD_REQS=0.6
 TOTEM_PLPARSER_REQS=3.2.0
 VALA_REQS=0.9.4
-LIBSOUP_REQS=2.34.0
+LIBSOUP_REQS=2.42.0
 GUDEV_REQS=143
 LIBMTP_REQS=0.3.0
 LIBPEAS_REQS=0.7.3
diff --git a/plugins/audiocd/rb-musicbrainz-lookup.c b/plugins/audiocd/rb-musicbrainz-lookup.c
index fcda910..e735463 100644
--- a/plugins/audiocd/rb-musicbrainz-lookup.c
+++ b/plugins/audiocd/rb-musicbrainz-lookup.c
@@ -452,11 +452,11 @@ rb_musicbrainz_lookup (const char *entity,
                                            rb_musicbrainz_lookup);
        g_simple_async_result_set_check_cancellable (result, cancellable);
 
-       session = soup_session_async_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-                                                      SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
-                                                      SOUP_SESSION_USER_AGENT,
-                                                      "Rhythmbox/" VERSION " ",
-                                                      NULL);
+       session = soup_session_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
+                                                SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
+                                                SOUP_SESSION_USER_AGENT,
+                                                "Rhythmbox/" VERSION " ",
+                                                NULL);
        uri_str = g_strdup_printf ("http://musicbrainz.org/ws/2/%s/%s";, entity, entity_id);
        uri = soup_uri_new (uri_str);
        g_free (uri_str);
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-account.c 
b/plugins/audioscrobbler/rb-audioscrobbler-account.c
index eb0f4f5..d610734 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-account.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-account.c
@@ -496,9 +496,9 @@ request_token (RBAudioscrobblerAccount *account)
        /* create the soup session, if we haven't got one yet */
        if (account->priv->soup_session == NULL) {
                account->priv->soup_session =
-                       soup_session_async_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-                                                            SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
-                                                            NULL);
+                       soup_session_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
+                                                      SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
+                                                      NULL);
        }
 
        /* create the request */
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c 
b/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
index 81ef40f..87f9a70 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
@@ -371,9 +371,9 @@ rb_audioscrobbler_radio_source_init (RBAudioscrobblerRadioSource *source)
        source->priv = RB_AUDIOSCROBBLER_RADIO_SOURCE_GET_PRIVATE (source);
 
        source->priv->soup_session =
-               soup_session_async_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-                                                    SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
-                                                    NULL);
+               soup_session_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
+                                              SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
+                                              NULL);
 }
 
 static void
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-user.c b/plugins/audioscrobbler/rb-audioscrobbler-user.c
index 78868a3..cd37123 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-user.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-user.c
@@ -351,9 +351,9 @@ rb_audioscrobbler_user_init (RBAudioscrobblerUser *user)
        user->priv = RB_AUDIOSCROBBLER_USER_GET_PRIVATE (user);
 
        user->priv->soup_session =
-               soup_session_async_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-                                                    SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
-                                                    NULL);
+               soup_session_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
+                                              SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
+                                              NULL);
 
        user->priv->file_to_data_queue_map = g_hash_table_new_full (g_file_hash,
                                                                    (GEqualFunc) g_file_equal,
diff --git a/plugins/audioscrobbler/rb-audioscrobbler.c b/plugins/audioscrobbler/rb-audioscrobbler.c
index db1b88e..4857e87 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler.c
@@ -801,7 +801,7 @@ rb_audioscrobbler_perform (RBAudioscrobbler *audioscrobbler,
        /* create soup session, if we haven't got one yet */
        if (!audioscrobbler->priv->soup_session) {
                audioscrobbler->priv->soup_session =
-                       soup_session_async_new_with_options (
+                       soup_session_new_with_options (
                                        SOUP_SESSION_ADD_FEATURE_BY_TYPE,
                                        SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
                                        NULL);
diff --git a/podcast/rb-podcast-search-itunes.c b/podcast/rb-podcast-search-itunes.c
index 512845d..672648b 100644
--- a/podcast/rb-podcast-search-itunes.c
+++ b/podcast/rb-podcast-search-itunes.c
@@ -141,9 +141,9 @@ impl_start (RBPodcastSearch *bsearch, const char *text, int max_results)
        char *limit;
        RBPodcastSearchITunes *search = RB_PODCAST_SEARCH_ITUNES (bsearch);
 
-       search->session = soup_session_async_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-                                                              SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
-                                                              NULL);
+       search->session = soup_session_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
+                                                        SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
+                                                        NULL);
 
        uri = soup_uri_new (ITUNES_SEARCH_URI);
        limit = g_strdup_printf ("%d", max_results);
diff --git a/podcast/rb-podcast-search-miroguide.c b/podcast/rb-podcast-search-miroguide.c
index 3de7ac1..8129872 100644
--- a/podcast/rb-podcast-search-miroguide.c
+++ b/podcast/rb-podcast-search-miroguide.c
@@ -153,9 +153,9 @@ impl_start (RBPodcastSearch *bsearch, const char *text, int max_results)
        char *limit;
        RBPodcastSearchMiroGuide *search = RB_PODCAST_SEARCH_MIROGUIDE (bsearch);
 
-       search->session = soup_session_async_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-                                                              SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
-                                                              NULL);
+       search->session = soup_session_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
+                                                        SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
+                                                        NULL);
 
        uri = soup_uri_new (MIROGUIDE_SEARCH_URI);
        limit = g_strdup_printf ("%d", max_results);