diff frontends/src/bridge/DBus.py @ 387:e66d300c5d42

frontends, bridge: sendFile method signature change + jid parameters in bridge now use _jid suffix
author Goffi <goffi@goffi.org>
date Thu, 29 Sep 2011 12:13:22 +0200
parents f964dcec1611
children 3ed53803b3b3
line wrap: on
line diff
--- a/frontends/src/bridge/DBus.py	Thu Sep 29 12:09:31 2011 +0200
+++ b/frontends/src/bridge/DBus.py	Thu Sep 29 12:13:22 2011 +0200
@@ -56,8 +56,8 @@
         else:
             error(_('Unknown interface'))
 
-    def addContact(self, entity, profile_key="@DEFAULT@"):
-        return self.db_core_iface.addContact(entity, profile_key)
+    def addContact(self, entity_jid, profile_key="@DEFAULT@"):
+        return self.db_core_iface.addContact(entity_jid, profile_key)
 
     def asyncConnect(self, profile_key="@DEFAULT@", callback=None, errback=None):
         return self.db_core_iface.asyncConnect(profile_key, reply_handler=callback, error_handler=errback)
@@ -74,8 +74,8 @@
     def createProfile(self, profile):
         return self.db_core_iface.createProfile(profile)
 
-    def delContact(self, entity, profile_key="@DEFAULT@"):
-        return self.db_core_iface.delContact(entity, profile_key)
+    def delContact(self, entity_jid, profile_key="@DEFAULT@"):
+        return self.db_core_iface.delContact(entity_jid, profile_key)
 
     def deleteProfile(self, profile):
         return self.db_core_iface.deleteProfile(profile)
@@ -152,8 +152,8 @@
     def subscription(self, sub_type, entity, profile_key="@DEFAULT@"):
         return self.db_core_iface.subscription(sub_type, entity, profile_key)
 
-    def updateContact(self, entity, name, groups, profile_key="@DEFAULT@"):
-        return self.db_core_iface.updateContact(entity, name, groups, profile_key)
+    def updateContact(self, entity_jid, name, groups, profile_key="@DEFAULT@"):
+        return self.db_core_iface.updateContact(entity_jid, name, groups, profile_key)
 
 
 #methods from plugins
@@ -193,8 +193,8 @@
     def quizGameAnswer(self, player, referee, answer, profile_key='@DEFAULT@'):
         return self.db_plugin_iface.quizGameAnswer(player, referee, answer, profile_key)
 
-    def sendFile(self, to, path, profile_key='@DEFAULT@'):
-        return self.db_plugin_iface.sendFile(to, path, profile_key)
+    def sendFile(self, to, path, data, profile_key='@DEFAULT@'):
+        return self.db_plugin_iface.sendFile(to, path, data, profile_key)
 
     def findGateways(self, target, profile_key='@DEFAULT@'):
         return self.db_plugin_iface.findGateways(target, profile_key)