From: Jens Georg <jensg@openismus.com>
Date: Sat, 2 Nov 2013 10:16:38 +0000 (+0100)
Subject: all: Port to new libsoup API
X-Git-Tag: RYGEL_0_21_1~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a278af81de4939fd41425d9fc49d744c352e1bb0;p=profile%2Fivi%2Frygel.git

all: Port to new libsoup API
---

diff --git a/configure.ac b/configure.ac
index 3de0fe7..8e8110b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,7 +44,7 @@ GSTPBU_REQUIRED=1.0
 GIO_REQUIRED=2.26
 GEE_REQUIRED=0.8.0
 UUID_REQUIRED=1.41.3
-LIBSOUP_REQUIRED=2.34.0
+LIBSOUP_REQUIRED=2.42.0
 GTK_REQUIRED=3.0
 
 dnl Additional requirements for media-export plugin
diff --git a/src/librygel-renderer/rygel-av-transport.vala b/src/librygel-renderer/rygel-av-transport.vala
index ee5785f..7d38e9a 100644
--- a/src/librygel-renderer/rygel-av-transport.vala
+++ b/src/librygel-renderer/rygel-av-transport.vala
@@ -152,12 +152,11 @@ internal class Rygel.AVTransport : Service {
                 !proxy.has_prefix ("https://")) {
                 proxy = "http://" + proxy;
             }
-            this.session = new SessionAsync.with_options (Soup.SESSION_PROXY_URI,
-                                                          new Soup.URI (proxy));
+            this.session = new Session.with_options (Soup.SESSION_PROXY_URI,
+                                                     new Soup.URI (proxy));
         } else {
-            this.session = new SessionAsync ();
+            this.session = new Session ();
         }
-        this.session.add_feature_by_type (typeof (Soup.ProxyResolverDefault));
         this.protocol_info = plugin.get_protocol_info ();
     }
 
diff --git a/src/librygel-server/rygel-import-resource.vala b/src/librygel-server/rygel-import-resource.vala
index 0b35fd2..2ecdbc2 100644
--- a/src/librygel-server/rygel-import-resource.vala
+++ b/src/librygel-server/rygel-import-resource.vala
@@ -89,7 +89,7 @@ internal class Rygel.ImportResource : GLib.Object, Rygel.StateMachine {
         this.bytes_total = 0;
 
         this.status = TransferStatus.IN_PROGRESS;
-        this.session = new SessionAsync ();
+        this.session = new Session ();
 
         content_dir.cancellable.cancelled.connect (() => {
             this.cancellable.cancel ();
diff --git a/src/plugins/mediathek/rygel-mediathek-root-container.vala b/src/plugins/mediathek/rygel-mediathek-root-container.vala
index 1534565..f4a2183 100644
--- a/src/plugins/mediathek/rygel-mediathek-root-container.vala
+++ b/src/plugins/mediathek/rygel-mediathek-root-container.vala
@@ -25,7 +25,7 @@ using Soup;
 
 public class Rygel.Mediathek.RootContainer : Rygel.TrackableContainer,
                                              Rygel.SimpleContainer {
-    private SessionAsync session;
+    private Session session;
     private static RootContainer instance;
     private static int DEFAULT_UPDATE_INTERVAL = 1800;
 
@@ -38,13 +38,13 @@ public class Rygel.Mediathek.RootContainer : Rygel.TrackableContainer,
         return instance;
     }
 
-    public static SessionAsync get_default_session () {
+    public static Session get_default_session () {
         return get_instance ().session;
     }
 
     private RootContainer () {
         base.root ("ZDF Mediathek");
-        this.session = new Soup.SessionAsync ();
+        this.session = new Soup.Session ();
     }
 
     private async void init () {