[rygel] core,mediathek: Adapt to new libxml VAPI



commit 5053f864c77442339c40d1eba41b3eb73bc65870
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Wed Feb 3 15:37:46 2010 +0200

    core,mediathek: Adapt to new libxml VAPI

 .../mediathek/rygel-mediathek-asx-playlist.vala    |    4 ++--
 .../mediathek/rygel-mediathek-rss-container.vala   |    6 +++---
 src/rygel/rygel-root-device-factory.vala           |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/plugins/mediathek/rygel-mediathek-asx-playlist.vala b/src/plugins/mediathek/rygel-mediathek-asx-playlist.vala
index fd0d428..dc75fe6 100644
--- a/src/plugins/mediathek/rygel-mediathek-asx-playlist.vala
+++ b/src/plugins/mediathek/rygel-mediathek-asx-playlist.vala
@@ -79,9 +79,9 @@ public class Rygel.MediathekAsxPlaylist : Object {
                                                (int)normalized_content.length);
 
                 if (doc != null) {
-                    var ctx = new XPathContext (doc);
+                    var ctx = new XPath.Context (doc);
                     var xpo = ctx.eval ("/asx/entry/ref/@href");
-                    if (xpo->type == XPathObjectType.NODESET) {
+                    if (xpo->type == XPath.ObjectType.NODESET) {
                         for (int i = 0; i < xpo->nodesetval->length (); i++) {
                             var item = xpo->nodesetval->item (i);
                             uris.add (item->children->content);
diff --git a/src/plugins/mediathek/rygel-mediathek-rss-container.vala b/src/plugins/mediathek/rygel-mediathek-rss-container.vala
index 46cd4cc..1681e77 100644
--- a/src/plugins/mediathek/rygel-mediathek-rss-container.vala
+++ b/src/plugins/mediathek/rygel-mediathek-rss-container.vala
@@ -56,16 +56,16 @@ public class Rygel.MediathekRssContainer : Rygel.SimpleContainer {
             this.children.clear ();
             this.child_count = 0;
 
-            var ctx = new XPathContext (doc);
+            var ctx = new XPath.Context (doc);
             var xpo = ctx.eval ("/rss/channel/title");
-            if (xpo->type == Xml.XPathObjectType.NODESET &&
+            if (xpo->type == Xml.XPath.ObjectType.NODESET &&
                 xpo->nodesetval->length () > 0) {
                 // just use first title (there should be only one)
                 this.title = xpo->nodesetval->item (0)->get_content ();
             }
 
             xpo = ctx.eval ("/rss/channel/item");
-            if (xpo->type == Xml.XPathObjectType.NODESET) {
+            if (xpo->type == Xml.XPath.ObjectType.NODESET) {
                 for (int i = 0; i < xpo->nodesetval->length (); i++) {
                     Xml.Node* node = xpo->nodesetval->item (i);
                     try {
diff --git a/src/rygel/rygel-root-device-factory.vala b/src/rygel/rygel-root-device-factory.vala
index 4fe3eeb..9bd63bb 100644
--- a/src/rygel/rygel-root-device-factory.vala
+++ b/src/rygel/rygel-root-device-factory.vala
@@ -263,7 +263,7 @@ public class Rygel.RootDeviceFactory {
         int res = -1;
 
         if (f != null)
-            res = Xml.Doc.dump (f, doc.doc);
+            res = doc.doc.dump (f);
 
         if (f == null || res == -1) {
             string message = "Failed to write modified description" +



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]