diff frontends/src/bridge/DBus.py @ 405:10b4f577d0c0

MUC update to follow wokkel's MUC branch update - bridge methods have been updated (API change) - plugin XEP-0045 has been updated
author Goffi <goffi@goffi.org>
date Sat, 08 Oct 2011 18:43:17 +0200
parents b2caa2615c4c
children dd4caab17008
line wrap: on
line diff
--- a/frontends/src/bridge/DBus.py	Sat Oct 08 11:19:25 2011 +0200
+++ b/frontends/src/bridge/DBus.py	Sat Oct 08 18:43:17 2011 +0200
@@ -160,14 +160,16 @@
 
 
 #methods from plugins
-    def getRoomJoined(self, profile_key='@DEFAULT@'):
-        return self.db_plugin_iface.getRoomJoined(profile_key)
+    def getRoomsJoined(self, profile_key='@DEFAULT@'):
+        return self.db_plugin_iface.getRoomsJoined(profile_key)
 
-    def getRoomSubjects(self, profile_key='@DEFAULT@'):
-        return self.db_plugin_iface.getRoomSubjects(profile_key)
+    def getRoomsSubjectss(self, profile_key='@DEFAULT@'):
+        return self.db_plugin_iface.getRoomsSubjectss(profile_key)
 
-    def joinMUC(self, service, roomId, nick, profile_key='@DEFAULT@'):
-        return self.db_plugin_iface.joinMUC(service, roomId, nick, profile_key)
+    def joinMUC(self, room_jid, nick, options, profile_key='@DEFAULT@'):
+        if options == None:
+            options = [('', '')] #XXX: we have to do this awful hack because python dbus need to guess the signature
+        return self.db_plugin_iface.joinMUC(room_jid, nick, options, profile_key)
 
     def tarotGameLaunch(self, players, profile_key='@DEFAULT@'):
         return self.db_plugin_iface.tarotGameLaunch(players, profile_key)