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

do not allow to have two windows of join_gc for the same account and changing the join gc window title if multiple accounts

Browse source
This commit is contained in:
Nikos Kouremenos 2005-04-21 18:53:16 +00:00
parent 58fc9bd255
commit f7123afe34
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/dialogs.py
View file

@ -458,19 +458,28 @@ class subscription_request_window:
class Join_groupchat_window: class Join_groupchat_window:
def __init__(self, plugin, account, server='', room = ''): def __init__(self, plugin, account, server='', room = ''):
if gajim.connections[account].connected < 2:
Error_dialog(_('You must be connected to join a groupchat'))
return
self.plugin = plugin self.plugin = plugin
self.account = account self.account = account
if gajim.connections[account].connected < 2:
Error_dialog(_('You must be connected to join a groupchat'))
# remove us from open windows
del self.plugin.windows[self.account]['join_gc']
return
self.xml = gtk.glade.XML(GTKGUI_GLADE, 'join_groupchat_window', APP) self.xml = gtk.glade.XML(GTKGUI_GLADE, 'join_groupchat_window', APP)
self.window = self.xml.get_widget('join_groupchat_window') self.window = self.xml.get_widget('join_groupchat_window')
self.xml.get_widget('server_entry').set_text(server) self.xml.get_widget('server_entry').set_text(server)
self.xml.get_widget('room_entry').set_text(room) self.xml.get_widget('room_entry').set_text(room)
self.xml.get_widget('nickname_entry').\ self.xml.get_widget('nickname_entry').set_text(
set_text(self.plugin.nicks[self.account]) self.plugin.nicks[self.account])
self.xml.signal_autoconnect(self) self.xml.signal_autoconnect(self)
self.plugin.windows[account]['join_gc'] = self #now add us to open windows self.plugin.windows[account]['join_gc'] = self #now add us to open windows
our_jid = gajim.config.get_per('accounts', self.account, 'name') + '@' + \
gajim.config.get_per('accounts', self.account, 'hostname')
if len(gajim.connections) > 1:
title = 'Join Groupchat as ' + our_jid
else:
title = 'Join Groupchat'
self.window.set_title(title)
self.recently_combobox = self.xml.get_widget('recently_combobox') self.recently_combobox = self.xml.get_widget('recently_combobox')
liststore = gtk.ListStore(str) liststore = gtk.ListStore(str)

7
src/roster_window.py
View file

@ -924,10 +924,11 @@ class Roster_window:
dialogs.Add_new_contact_window(self.plugin, account) dialogs.Add_new_contact_window(self.plugin, account)
def on_join_gc_activate(self, widget, account): def on_join_gc_activate(self, widget, account):
if not self.plugin.windows[account].has_key('join_gc'): if self.plugin.windows[account].has_key('join_gc'):
dialogs.Join_groupchat_window(self.plugin, account)
else:
self.plugin.windows[account]['join_gc'].window.present() self.plugin.windows[account]['join_gc'].window.present()
else:
self.plugin.windows[account]['join_gc'] = dialogs.Join_groupchat_window(self.plugin, account)
def on_new_message_menuitem_activate(self, widget, account): def on_new_message_menuitem_activate(self, widget, account):
dialogs.New_message_dialog(self.plugin, account) dialogs.New_message_dialog(self.plugin, account)