From: Andre L. V. Loureiro <loureiro.andrew@gmail.com>
Date: Wed, 27 May 2009 23:22:47 +0000 (-0400)
Subject: fixed the dbus iface name in zb_server.py
X-Git-Url: https://vcs.maemo.org/git/?p=zukebox;a=commitdiff_plain;h=3dd322c46c92da8c989c0157c23b9dcce71aaf74

fixed the dbus iface name in zb_server.py
---

diff --git a/zukebox_server/src/server/zb_server.py b/zukebox_server/src/server/zb_server.py
index 0dbed0c..8fda553 100644
--- a/zukebox_server/src/server/zb_server.py
+++ b/zukebox_server/src/server/zb_server.py
@@ -39,8 +39,8 @@ class ZukeBoxServer(ZIface, dbus.service.Object):
     """
 
     DBUS_SERVICE_NAME = "br.org.zagaia"
-    DBUS_OBJ_PATH = "/br/org/zagaia/ZukeBox"
-    DBUS_IFACE = "br.org.zagaia.ZukeBox"
+    DBUS_OBJ_PATH = "/br/org/zagaia/zukebox/ZukeBoxServer"
+    DBUS_IFACE = "br.org.zagaia.zukebox.ZukeBoxServer"
 
     plugins_folder = config.get_parameter("zukebox_server", "plugins")
     plugins_module_path = "zukebox_server.plugins"
@@ -71,7 +71,7 @@ class ZukeBoxServer(ZIface, dbus.service.Object):
 
         self.device = Device('urn:schemas-upnp-org:device:ZukeBoxServer:1',
                 self.server_name, force_listen_url=self.listen_url,
-                manufacturer="Zagaia Laboratory and INdT Brazil",
+                manufacturer="Zagaia Laboratory",
                 manufacturer_url=project_page,
                 model_description=model_description,
                 model_name=model_name, model_number=serial_no,
@@ -93,7 +93,8 @@ class ZukeBoxServer(ZIface, dbus.service.Object):
         """Start the ZukeBox Server"""
         self._create_device()
         self._create_services()
-        self.cds.control_controller.plugin_manager.plugins_instances["audio_library"].do_scan()
+        #pm = self.cds.control_controller.plugin_manager
+        #pm.plugins_instances["audio_library"].do_scan()
         self.device.start()
         reactor.add_after_stop_func(self.device.stop)
         reactor.main()