# HG changeset patch
# User Goffi <goffi@goffi.org>
# Date 1470610201 -7200
# Node ID 70bd7b242a9e45ee94201501d6fa49ba3109cb6f
# Parent  666b42c957b5fe18154ce37d1a5d76b59729b427
plugin XEP-0045: fixed options parameter handling in bridge callback

diff -r 666b42c957b5 -r 70bd7b242a9e src/plugins/plugin_xep_0045.py
--- a/src/plugins/plugin_xep_0045.py	Mon Aug 08 00:49:17 2016 +0200
+++ b/src/plugins/plugin_xep_0045.py	Mon Aug 08 00:50:01 2016 +0200
@@ -388,7 +388,7 @@
         """
         return self.host.memory.getConfig(CONFIG_SECTION, 'default_muc', default_conf['default_muc'])
 
-    def _join(self, room_jid_s, nick, options=None, profile_key=C.PROF_KEY_NONE):
+    def _join(self, room_jid_s, nick, options, profile_key=C.PROF_KEY_NONE):
         """join method used by bridge
 
         @return: unicode (the room bare)
@@ -405,7 +405,7 @@
         else:
             room_jid = self.getUniqueName(profile_key=client.profile)
         # TODO: error management + signal in bridge
-        d = self.join(client, room_jid, nick, options)
+        d = self.join(client, room_jid, nick, options or None)
         return d.addCallback(lambda room: room.roomJID.userhost())
 
     def join(self, client, room_jid, nick=None, options=None):