# HG changeset patch # User Goffi # Date 1323725090 -3600 # Node ID 961543b208068642f83cd5e96db1398b7d583900 # Parent 17c7e48bf68f00af540ba66c782994330fb0e326 bridge: removed default profile_key in dbus_frontend_template to avoid difficult to find bugs diff -r 17c7e48bf68f -r 961543b20806 frontends/src/bridge/DBus.py --- a/frontends/src/bridge/DBus.py Sun Dec 04 16:18:56 2011 +0100 +++ b/frontends/src/bridge/DBus.py Mon Dec 12 22:24:50 2011 +0100 @@ -167,80 +167,80 @@ #methods from plugins - def getRoomsJoined(self, profile_key='@DEFAULT@'): + def getRoomsJoined(self, profile_key): return self.db_plugin_iface.getRoomsJoined(profile_key) - def getRoomsSubjectss(self, profile_key='@DEFAULT@'): + def getRoomsSubjectss(self, profile_key): return self.db_plugin_iface.getRoomsSubjectss(profile_key) - def joinMUC(self, room_jid, nick, options, profile_key='@DEFAULT@'): + def joinMUC(self, room_jid, nick, options, profile_key): 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@'): + def tarotGameLaunch(self, players, profile_key): return self.db_plugin_iface.tarotGameLaunch(players, profile_key) - def tarotGameCreate(self, room_jid, players, profile_key='@DEFAULT@'): + def tarotGameCreate(self, room_jid, players, profile_key): return self.db_plugin_iface.tarotGameCreate(room_jid, players, profile_key) - def tarotGameReady(self, player, referee, profile_key='@DEFAULT@'): + def tarotGameReady(self, player, referee, profile_key): return self.db_plugin_iface.tarotGameReady(player, referee, profile_key) - def tarotGameContratChoosed(self, player, referee, contrat, profile_key='@DEFAULT@'): + def tarotGameContratChoosed(self, player, referee, contrat, profile_key): return self.db_plugin_iface.tarotGameContratChoosed(player, referee, contrat, profile_key) - def tarotGamePlayCards(self, player, referee, cards, profile_key='@DEFAULT@'): + def tarotGamePlayCards(self, player, referee, cards, profile_key): return self.db_plugin_iface.tarotGamePlayCards(player, referee, cards, profile_key) - def quizGameLaunch(self, players, profile_key='@DEFAULT@'): + def quizGameLaunch(self, players, profile_key): return self.db_plugin_iface.quizGameLaunch(players, profile_key) - def quizGameCreate(self, room_jid, players, profile_key='@DEFAULT@'): + def quizGameCreate(self, room_jid, players, profile_key): return self.db_plugin_iface.quizGameCreate(room_jid, players, profile_key) - def quizGameReady(self, player, referee, profile_key='@DEFAULT@'): + def quizGameReady(self, player, referee, profile_key): return self.db_plugin_iface.quizGameReady(player, referee, profile_key) - def quizGameAnswer(self, player, referee, answer, profile_key='@DEFAULT@'): + def quizGameAnswer(self, player, referee, answer, profile_key): return self.db_plugin_iface.quizGameAnswer(player, referee, answer, profile_key) - def sendFile(self, to, path, data, profile_key='@DEFAULT@'): + def sendFile(self, to, path, data, profile_key): return self.db_plugin_iface.sendFile(to, path, data, profile_key) - def pipeOut(self, to, path, data, profile_key='@DEFAULT@'): + def pipeOut(self, to, path, data, profile_key): return self.db_plugin_iface.pipeOut(to, path, data, profile_key) - def findGateways(self, target, profile_key='@DEFAULT@'): + def findGateways(self, target, profile_key): return self.db_plugin_iface.findGateways(target, profile_key) - def getCard(self, target, profile_key='@DEFAULT@'): + def getCard(self, target, profile_key): return self.db_plugin_iface.getCard(target, profile_key) - def getCardCache(self, target, profile_key='@DEFAULT@'): + def getCardCache(self, target, profile_key): return self.db_plugin_iface.getCardCache(target, profile_key) def getAvatarFile(self, hash): return self.db_plugin_iface.getAvatarFile(hash) - def in_band_register(self, target, profile_key='@DEFAULT@'): + def in_band_register(self, target, profile_key): return self.db_plugin_iface.in_band_register(target, profile_key) - def gatewayRegister(self, action, target, data, profile_key='@DEFAULT@'): + def gatewayRegister(self, action, target, data, profile_key): if data == None: data = [('', '')] #XXX: we have to do this awful hack because python dbus need to guess the signature return self.db_plugin_iface.gatewayRegister(action, target, data, profile_key) - def getLastMicroblogs(self, jid, max_items, profile_key='@DEFAULT@', callback=None, errback=None): + def getLastMicroblogs(self, jid, max_items, profile_key, callback=None, errback=None): return self.db_plugin_iface.getLastMicroblogs(jid, max_items, profile_key, reply_handler=callback, error_handler=errback) - def getMblogNodes(self, profile_key='@DEFAULT@', callback=None, errback=None): + def getMblogNodes(self, profile_key, callback=None, errback=None): return self.db_plugin_iface.getMblogNodes(profile_key, reply_handler=callback, error_handler=errback) - def sendGroupBlog(self, groups, message, profile_key='@DEFAULT@'): + def sendGroupBlog(self, groups, message, profile_key): return self.db_plugin_iface.sendGroupBlog(groups, message, profile_key) - def sendPersonalEvent(self, event_type, data, profile_key='@DEFAULT@'): + def sendPersonalEvent(self, event_type, data, profile_key): return self.db_plugin_iface.sendPersonalEvent(event_type, data, profile_key) def setMicroblogAccess(self, access="presence", profile_key='@DEFAULT@', callback=None, errback=None): diff -r 17c7e48bf68f -r 961543b20806 src/bridge/bridge_constructor/dbus_frontend_template.py --- a/src/bridge/bridge_constructor/dbus_frontend_template.py Sun Dec 04 16:18:56 2011 +0100 +++ b/src/bridge/bridge_constructor/dbus_frontend_template.py Mon Dec 12 22:24:50 2011 +0100 @@ -60,80 +60,80 @@ ##METHODS_PART## #methods from plugins - def getRoomsJoined(self, profile_key='@DEFAULT@'): + def getRoomsJoined(self, profile_key): return self.db_plugin_iface.getRoomsJoined(profile_key) - def getRoomsSubjectss(self, profile_key='@DEFAULT@'): + def getRoomsSubjectss(self, profile_key): return self.db_plugin_iface.getRoomsSubjectss(profile_key) - def joinMUC(self, room_jid, nick, options, profile_key='@DEFAULT@'): + def joinMUC(self, room_jid, nick, options, profile_key): 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@'): + def tarotGameLaunch(self, players, profile_key): return self.db_plugin_iface.tarotGameLaunch(players, profile_key) - def tarotGameCreate(self, room_jid, players, profile_key='@DEFAULT@'): + def tarotGameCreate(self, room_jid, players, profile_key): return self.db_plugin_iface.tarotGameCreate(room_jid, players, profile_key) - def tarotGameReady(self, player, referee, profile_key='@DEFAULT@'): + def tarotGameReady(self, player, referee, profile_key): return self.db_plugin_iface.tarotGameReady(player, referee, profile_key) - def tarotGameContratChoosed(self, player, referee, contrat, profile_key='@DEFAULT@'): + def tarotGameContratChoosed(self, player, referee, contrat, profile_key): return self.db_plugin_iface.tarotGameContratChoosed(player, referee, contrat, profile_key) - def tarotGamePlayCards(self, player, referee, cards, profile_key='@DEFAULT@'): + def tarotGamePlayCards(self, player, referee, cards, profile_key): return self.db_plugin_iface.tarotGamePlayCards(player, referee, cards, profile_key) - def quizGameLaunch(self, players, profile_key='@DEFAULT@'): + def quizGameLaunch(self, players, profile_key): return self.db_plugin_iface.quizGameLaunch(players, profile_key) - def quizGameCreate(self, room_jid, players, profile_key='@DEFAULT@'): + def quizGameCreate(self, room_jid, players, profile_key): return self.db_plugin_iface.quizGameCreate(room_jid, players, profile_key) - def quizGameReady(self, player, referee, profile_key='@DEFAULT@'): + def quizGameReady(self, player, referee, profile_key): return self.db_plugin_iface.quizGameReady(player, referee, profile_key) - def quizGameAnswer(self, player, referee, answer, profile_key='@DEFAULT@'): + def quizGameAnswer(self, player, referee, answer, profile_key): return self.db_plugin_iface.quizGameAnswer(player, referee, answer, profile_key) - def sendFile(self, to, path, data, profile_key='@DEFAULT@'): + def sendFile(self, to, path, data, profile_key): return self.db_plugin_iface.sendFile(to, path, data, profile_key) - def pipeOut(self, to, path, data, profile_key='@DEFAULT@'): + def pipeOut(self, to, path, data, profile_key): return self.db_plugin_iface.pipeOut(to, path, data, profile_key) - def findGateways(self, target, profile_key='@DEFAULT@'): + def findGateways(self, target, profile_key): return self.db_plugin_iface.findGateways(target, profile_key) - def getCard(self, target, profile_key='@DEFAULT@'): + def getCard(self, target, profile_key): return self.db_plugin_iface.getCard(target, profile_key) - def getCardCache(self, target, profile_key='@DEFAULT@'): + def getCardCache(self, target, profile_key): return self.db_plugin_iface.getCardCache(target, profile_key) def getAvatarFile(self, hash): return self.db_plugin_iface.getAvatarFile(hash) - def in_band_register(self, target, profile_key='@DEFAULT@'): + def in_band_register(self, target, profile_key): return self.db_plugin_iface.in_band_register(target, profile_key) - def gatewayRegister(self, action, target, data, profile_key='@DEFAULT@'): + def gatewayRegister(self, action, target, data, profile_key): if data == None: data = [('', '')] #XXX: we have to do this awful hack because python dbus need to guess the signature return self.db_plugin_iface.gatewayRegister(action, target, data, profile_key) - def getLastMicroblogs(self, jid, max_items, profile_key='@DEFAULT@', callback=None, errback=None): + def getLastMicroblogs(self, jid, max_items, profile_key, callback=None, errback=None): return self.db_plugin_iface.getLastMicroblogs(jid, max_items, profile_key, reply_handler=callback, error_handler=errback) - def getMblogNodes(self, profile_key='@DEFAULT@', callback=None, errback=None): + def getMblogNodes(self, profile_key, callback=None, errback=None): return self.db_plugin_iface.getMblogNodes(profile_key, reply_handler=callback, error_handler=errback) - def sendGroupBlog(self, groups, message, profile_key='@DEFAULT@'): + def sendGroupBlog(self, groups, message, profile_key): return self.db_plugin_iface.sendGroupBlog(groups, message, profile_key) - def sendPersonalEvent(self, event_type, data, profile_key='@DEFAULT@'): + def sendPersonalEvent(self, event_type, data, profile_key): return self.db_plugin_iface.sendPersonalEvent(event_type, data, profile_key) def setMicroblogAccess(self, access="presence", profile_key='@DEFAULT@', callback=None, errback=None):