copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix error dialog. Fixes #6906

Browse source
This commit is contained in:
Yann Leboulanger 2011-07-01 16:08:15 +02:00
parent 5bba1d51fc
commit ae0a47df85
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gui_interface.py
View file

@ -1925,7 +1925,8 @@ class Interface:
Join the room immediately Join the room immediately
""" """
if gajim.contacts.get_contact(account, room_jid): if gajim.contacts.get_contact(account, room_jid) and \
not gajim.contacts.get_contact(account, room_jid).is_groupchat():
dialogs.ErrorDialog(_('This is not a group chat'), dialogs.ErrorDialog(_('This is not a group chat'),
_('%s is not the name of a group chat.') % room_jid) _('%s is not the name of a group chat.') % room_jid)
return return
@ -1933,11 +1934,17 @@ class Interface:
if not nick: if not nick:
nick = gajim.nicks[account] nick = gajim.nicks[account]
if self.msg_win_mgr.has_window(room_jid, account) and \ minimized_control = gajim.interface.minimized_controls[account].get(
gajim.gc_connected[account][room_jid]: room_jid, None)
gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account)
win = gc_ctrl.parent_win if (self.msg_win_mgr.has_window(room_jid, account) or \
win.set_active_tab(gc_ctrl) minimized_control) and gajim.gc_connected[account][room_jid]:
if self.msg_win_mgr.has_window(room_jid, account):
gc_ctrl = self.msg_win_mgr.get_gc_control(room_jid, account)
win = gc_ctrl.parent_win
win.set_active_tab(gc_ctrl)
else:
self.roster.on_groupchat_maximized(None, room_jid, account)
dialogs.ErrorDialog(_('You are already in group chat %s') % \ dialogs.ErrorDialog(_('You are already in group chat %s') % \
room_jid) room_jid)
return return
@ -1948,9 +1955,6 @@ class Interface:
_('You cannot join a group chat while you are invisible')) _('You cannot join a group chat while you are invisible'))
return return
minimized_control = gajim.interface.minimized_controls[account].get(
room_jid, None)
if minimized_control is None and not self.msg_win_mgr.has_window( if minimized_control is None and not self.msg_win_mgr.has_window(
room_jid, account): room_jid, account):
# Join new groupchat # Join new groupchat
@ -1970,10 +1974,6 @@ class Interface:
gc_control = self.msg_win_mgr.get_gc_control(room_jid, account) gc_control = self.msg_win_mgr.get_gc_control(room_jid, account)
gc_control.nick = nick gc_control.nick = nick
gc_control.parent_win.set_active_tab(gc_control) gc_control.parent_win.set_active_tab(gc_control)
else:
# We are already in this groupchat and it is minimized
minimized_control.nick = nick
self.roster.add_groupchat(room_jid, account)
# Connect # Connect
gajim.connections[account].join_gc(nick, room_jid, password) gajim.connections[account].join_gc(nick, room_jid, password)