jid when destroying room is optional

This commit is contained in:
Yann Leboulanger 2007-10-17 15:16:26 +00:00
parent 19888fcd7b
commit c9c066f8e6
1 changed files with 9 additions and 8 deletions

View File

@ -1668,18 +1668,19 @@ class GroupchatControl(ChatControlBase):
if response == gtk.RESPONSE_OK: if response == gtk.RESPONSE_OK:
reason = instance.input_entry1.get_text().decode('utf-8') reason = instance.input_entry1.get_text().decode('utf-8')
jid = instance.input_entry2.get_text().decode('utf-8') jid = instance.input_entry2.get_text().decode('utf-8')
# Test jid if jid:
try: # Test jid
jid = helpers.parse_jid(jid) try:
except: jid = helpers.parse_jid(jid)
dialogs.ErrorDialog(_('Invalid group chat Jabber ID'), except:
_('The group chat Jabber ID has not allowed characters.')) dialogs.ErrorDialog(_('Invalid group chat Jabber ID'),
return _('The group chat Jabber ID has not allowed characters.'))
return
else: else:
# Abord destroy operation # Abord destroy operation
return return
gajim.connections[self.account].destroy_gc_room(self.room_jid, reason, gajim.connections[self.account].destroy_gc_room(self.room_jid, reason,
jid) jid)
def _on_bookmark_room_menuitem_activate(self, widget): def _on_bookmark_room_menuitem_activate(self, widget):
bm = { bm = {