GNOME.org
 

[rhythmbox] update libsoup features and stop using libsoup-gnome

commit 4e0e1f7ed0287e5bcba98388c75a93c3cf9ca090
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Dec 5 13:20:34 2013 +1000

    update libsoup features and stop using libsoup-gnome

 configure.ac                                       |    3 +--
 plugins/audiocd/rb-musicbrainz-lookup.c            |    3 +--
 plugins/audioscrobbler/rb-audioscrobbler-account.c |    3 +--
 .../rb-audioscrobbler-radio-source.c               |    3 +--
 plugins/audioscrobbler/rb-audioscrobbler-user.c    |    3 +--
 plugins/audioscrobbler/rb-audioscrobbler.c         |    4 ++--
 podcast/rb-podcast-search-itunes.c                 |    3 +--
 podcast/rb-podcast-search-miroguide.c              |    3 +--
 8 files changed, 9 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index afe23bd..74c00ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ GLIB_REQS=2.32.0
 LIBGPOD_REQS=0.6
 TOTEM_PLPARSER_REQS=3.2.0
 VALA_REQS=0.9.4
-LIBSOUP_REQS=2.26.0
+LIBSOUP_REQS=2.34.0
 GUDEV_REQS=143
 LIBMTP_REQS=0.3.0
 LIBPEAS_REQS=0.7.3
@@ -110,7 +110,6 @@ PKG_CHECK_MODULES(RHYTHMBOX,                                \
                  gio-2.0 >= $GLIB_REQS                 \
                  gio-unix-2.0 >= $GLIB_REQS            \
                  libsoup-2.4 >= $LIBSOUP_REQS          \
-                 libsoup-gnome-2.4 >= $LIBSOUP_REQS    \
                  libpeas-1.0 >= $LIBPEAS_REQS          \
                  libpeas-gtk-1.0 >= $LIBPEAS_REQS      \
                  libxml-2.0 >= $LIBXML2_REQS           \
diff --git a/plugins/audiocd/rb-musicbrainz-lookup.c b/plugins/audiocd/rb-musicbrainz-lookup.c
index d35023d..fcda910 100644
--- a/plugins/audiocd/rb-musicbrainz-lookup.c
+++ b/plugins/audiocd/rb-musicbrainz-lookup.c
@@ -32,7 +32,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <libsoup/soup.h>
-#include <libsoup/soup-gnome.h>
 
 #include "rb-musicbrainz-lookup.h"
 
@@ -454,7 +453,7 @@ rb_musicbrainz_lookup (const char *entity,
        g_simple_async_result_set_check_cancellable (result, cancellable);
 
        session = soup_session_async_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-                                                      SOUP_TYPE_GNOME_FEATURES_2_26,
+                                                      SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
                                                       SOUP_SESSION_USER_AGENT,
                                                       "Rhythmbox/" VERSION " ",
                                                       NULL);
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-account.c 
b/plugins/audioscrobbler/rb-audioscrobbler-account.c
index d50ef00..eb0f4f5 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-account.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-account.c
@@ -31,7 +31,6 @@
 #include <glib/gi18n.h>
 
 #include <libsoup/soup.h>
-#include <libsoup/soup-gnome.h>
 #include <json-glib/json-glib.h>
 
 #include "rb-audioscrobbler-account.h"
@@ -498,7 +497,7 @@ request_token (RBAudioscrobblerAccount *account)
        if (account->priv->soup_session == NULL) {
                account->priv->soup_session =
                        soup_session_async_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-                                                            SOUP_TYPE_GNOME_FEATURES_2_26,
+                                                            SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
                                                             NULL);
        }
 
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c 
b/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
index 54ad2b1..acd1c3c 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-radio-source.c
@@ -30,7 +30,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <libsoup/soup.h>
-#include <libsoup/soup-gnome.h>
 #include <json-glib/json-glib.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
@@ -373,7 +372,7 @@ rb_audioscrobbler_radio_source_init (RBAudioscrobblerRadioSource *source)
 
        source->priv->soup_session =
                soup_session_async_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-                                                    SOUP_TYPE_GNOME_FEATURES_2_26,
+                                                    SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
                                                     NULL);
 }
 
diff --git a/plugins/audioscrobbler/rb-audioscrobbler-user.c b/plugins/audioscrobbler/rb-audioscrobbler-user.c
index 3e6859c..78868a3 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler-user.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler-user.c
@@ -28,7 +28,6 @@
 
 #include <string.h>
 #include <libsoup/soup.h>
-#include <libsoup/soup-gnome.h>
 #include <json-glib/json-glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -353,7 +352,7 @@ rb_audioscrobbler_user_init (RBAudioscrobblerUser *user)
 
        user->priv->soup_session =
                soup_session_async_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-                                                    SOUP_TYPE_GNOME_FEATURES_2_26,
+                                                    SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
                                                     NULL);
 
        user->priv->file_to_data_queue_map = g_hash_table_new_full (g_file_hash,
diff --git a/plugins/audioscrobbler/rb-audioscrobbler.c b/plugins/audioscrobbler/rb-audioscrobbler.c
index aa1079a..1b2d7b8 100644
--- a/plugins/audioscrobbler/rb-audioscrobbler.c
+++ b/plugins/audioscrobbler/rb-audioscrobbler.c
@@ -43,7 +43,6 @@
 #include <gtk/gtk.h>
 
 #include <libsoup/soup.h>
-#include <libsoup/soup-gnome.h>
 
 #include "rb-audioscrobbler.h"
 #include "rb-debug.h"
@@ -804,7 +803,8 @@ rb_audioscrobbler_perform (RBAudioscrobbler *audioscrobbler,
        if (!audioscrobbler->priv->soup_session) {
                audioscrobbler->priv->soup_session =
                        soup_session_async_new_with_options (
-                                       SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_GNOME_FEATURES_2_26,
+                                       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 421a92d..512845d 100644
--- a/podcast/rb-podcast-search-itunes.c
+++ b/podcast/rb-podcast-search-itunes.c
@@ -32,7 +32,6 @@
 #include "rb-debug.h"
 
 #include <libsoup/soup.h>
-#include <libsoup/soup-gnome.h>
 #include <json-glib/json-glib.h>
 
 #define RB_TYPE_PODCAST_SEARCH_ITUNES         (rb_podcast_search_itunes_get_type ())
@@ -143,7 +142,7 @@ impl_start (RBPodcastSearch *bsearch, const char *text, int max_results)
        RBPodcastSearchITunes *search = RB_PODCAST_SEARCH_ITUNES (bsearch);
 
        search->session = soup_session_async_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-                                                              SOUP_TYPE_GNOME_FEATURES_2_26,
+                                                              SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
                                                               NULL);
 
        uri = soup_uri_new (ITUNES_SEARCH_URI);
diff --git a/podcast/rb-podcast-search-miroguide.c b/podcast/rb-podcast-search-miroguide.c
index d7fd519..3de7ac1 100644
--- a/podcast/rb-podcast-search-miroguide.c
+++ b/podcast/rb-podcast-search-miroguide.c
@@ -32,7 +32,6 @@
 #include "rb-debug.h"
 
 #include <libsoup/soup.h>
-#include <libsoup/soup-gnome.h>
 #include <json-glib/json-glib.h>
 #include <totem-pl-parser.h>
 
@@ -155,7 +154,7 @@ impl_start (RBPodcastSearch *bsearch, const char *text, int max_results)
        RBPodcastSearchMiroGuide *search = RB_PODCAST_SEARCH_MIROGUIDE (bsearch);
 
        search->session = soup_session_async_new_with_options (SOUP_SESSION_ADD_FEATURE_BY_TYPE,
-                                                              SOUP_TYPE_GNOME_FEATURES_2_26,
+                                                              SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
                                                               NULL);
 
        uri = soup_uri_new (MIROGUIDE_SEARCH_URI);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]