diff src/bridge/DBus.py @ 266:c4b84a2d2ad1

bridge: constructor and template improved, documentation added
author Goffi <goffi@goffi.org>
date Mon, 24 Jan 2011 17:47:45 +0100
parents af3d4f11fe43
children bdcd535e179e
line wrap: on
line diff
--- a/src/bridge/DBus.py	Mon Jan 24 01:22:00 2011 +0100
+++ b/src/bridge/DBus.py	Mon Jan 24 17:47:45 2011 +0100
@@ -24,7 +24,6 @@
 import dbus
 import dbus.service
 import dbus.mainloop.glib
-import pdb
 from logging import debug, info, error
 
 const_INT_PREFIX = "org.goffi.SAT"  #Interface prefix
@@ -55,7 +54,7 @@
     
     @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
                          signature='ss')
-    def connection_error(self, profile, error_type):
+    def connection_error(self, error_type, profile):
         debug("Connection_error signal")
     
     @dbus.service.signal(const_INT_PREFIX+const_COMM_SUFFIX,
@@ -142,7 +141,7 @@
                          in_signature='s', out_signature='i')
     def deleteProfile(self, name):
         info ('Profile deletion asked')
-        return self.cb["deleteProfile"](str(name))
+        return self.cb["deleteProfile"](unicode(name))
 
     @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
                          in_signature='sssi', out_signature='s')
@@ -163,7 +162,7 @@
         return self.cb["disconnect"](profile_key)
     
     @dbus.service.method(const_INT_PREFIX+const_COMM_SUFFIX,
-                         in_signature='', out_signature='b')
+                         in_signature='s', out_signature='b')
     def isConnected(self, profile_key='@DEFAULT@'):
         info ("Connection status asked")
         return self.cb["isConnected"](profile_key)