Author: asterix Date: 2007-06-24 23:19:41 +0200 (Sun, 24 Jun 2007) New Revision: 8305
Modified: trunk/src/common/connection_handlers.py trunk/src/gajim.py Log: ask password to user when we try to connect to a password protected room. fixes #2890
Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-06-23 21:45:09 UTC (rev 8304) +++ trunk/src/common/connection_handlers.py 2007-06-24 21:19:41 UTC (rev 8305) @@ -1658,8 +1658,8 @@ self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, prio, keyID, timestamp, None)) elif errcode == '401': # password required to join - self.dispatch('ERROR', (_('Unable to join group chat'), - _('A password is required to join this group chat.'))) + room_jid, nick = gajim.get_room_and_nick_from_fjid(who) + self.dispatch('GC_PASSWORD_REQUIRED', (room_jid, nick)) elif errcode == '403': # we are banned self.dispatch('ERROR', (_('Unable to join group chat'), _('You are banned from this group chat.')))
Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-06-23 21:45:09 UTC (rev 8304) +++ trunk/src/gajim.py 2007-06-24 21:19:41 UTC (rev 8305) @@ -1212,6 +1212,27 @@ self.instances[account]['gc_config'][room_jid].\ affiliation_list_received(array[1], array[2])
+ def handle_event_gc_password_required(self, account, array): + #('GC_PASSWORD_REQUIRED', account, (room_jid, nick)) + room_jid = array[0] + nick = array[1] + dlg = dialogs.InputDialog(_('Password Required'), + _('A Password is required to join the room %s. Please type it') % \ + room_jid, is_modal = True) + response = dlg.get_response() + if response == gtk.RESPONSE_OK: + password = dlg.input_entry.get_text() + gajim.connections[account].join_gc(nick, room_jid, password) + gajim.gc_passwords[room_jid] = password + else: + # get and destroy window + if room_jid in gajim.interface.minimized_controls[account]: + self.roster.on_disconnect(None, room_jid, account) + else: + win = self.msg_win_mgr.get_window(room_jid, account) + ctrl = win.get_control(room_jid, account) + win.remove_tab(ctrl, 3) + def handle_event_gc_invitation(self, account, array): #('GC_INVITATION', (room_jid, jid_from, reason, password)) jid = gajim.get_jid_without_resource(array[1]) @@ -2086,6 +2107,7 @@ 'GC_CONFIG': self.handle_event_gc_config, 'GC_INVITATION': self.handle_event_gc_invitation, 'GC_AFFILIATION': self.handle_event_gc_affiliation, + 'GC_PASSWORD_REQUIRED': self.handle_event_gc_password_required, 'BAD_PASSPHRASE': self.handle_event_bad_passphrase, 'ROSTER_INFO': self.handle_event_roster_info, 'BOOKMARKS': self.handle_event_bookmarks,