From 633bafd4a78ecd216c160765f8f8b98d93d501ce Mon Sep 17 00:00:00 2001
From: Frederik 'playya' Sdun <Frederik.Sdun@googlemail.com>
Date: Wed, 29 Apr 2009 12:44:11 +0200
Subject: [PATCH] ListObjectsByInterface returns DBus.ObjectPath

---
 src/obj.vala | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/obj.vala b/src/obj.vala
index 0f08395..585841f 100644
--- a/src/obj.vala
+++ b/src/obj.vala
@@ -168,12 +168,12 @@ public class Server : Object
             }
     }
 
-    public string[] ListObjectsByInterface( string busname, string iface ) throws DBus.Error
+    public DBus.ObjectPath[] ListObjectsByInterface( string busname, string iface ) throws DBus.Error
     {
         //
         // Check whether the given busname is present on the bus
         //
-        var paths = new List<string>();
+        var paths = new List<DBus.ObjectPath>();
         var existing_busnames = this.ListBusNames();
         bool found = false;
         foreach ( string name in existing_busnames )
@@ -188,13 +188,13 @@ public class Server : Object
         {
             message( "requested busname '%s' not found.", busname );
             // FIXME return a dbus error
-            return stringListToArray( paths );
+            return objectPathListToArray( paths );
         }
-        listObjectsByInterface( ref paths, busname, "/", iface );
-        return stringListToArray( paths );
+        listObjectsByInterface( ref paths, busname, (DBus.ObjectPath)"/", iface );
+        return objectPathListToArray( paths );
     }
 
-    private void listObjectsByInterface( ref List<string> paths, string busname, string objname, string iface ) throws DBus.Error
+    private void listObjectsByInterface( ref List<DBus.ObjectPath> paths, string busname, DBus.ObjectPath objname, string iface ) throws DBus.Error
     {
         debug( "listObjectsByInterface: %s, %s, %s", busname, objname, iface );
         dynamic DBus.Object obj = conn.get_object( busname, objname, DBUS_INTERFACE_INTROSPECTABLE );
@@ -208,10 +208,10 @@ public class Server : Object
         if ( data.nodes.length() > 0 )
             foreach ( string node in data.nodes )
         {
-            if ( objname == "/" )
-                listObjectsByInterface( ref paths, busname, objname+node, iface );
+            if ( objname == (DBus.ObjectPath)"/" )
+                listObjectsByInterface( ref paths, busname, (DBus.ObjectPath)((string)objname+node), iface );
             else
-                listObjectsByInterface( ref paths, busname, objname+"/"+node, iface );
+                listObjectsByInterface( ref paths, busname, (DBus.ObjectPath)((string)objname+"/"+node), iface );
         }
     }
 
-- 
2.11.4.GIT