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

ticket 86 remains

Browse source
This commit is contained in:
Nikos Kouremenos 2005-03-12 15:50:13 +00:00
parent 9aea41330b
commit 6b8203916f
3 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
plugins/gtkgui/config.py
View file

@ -1002,7 +1002,7 @@ class Account_modification_window:
self.xml.get_widget('autoconnect_checkbutton').set_active(\ self.xml.get_widget('autoconnect_checkbutton').set_active(\
infos['autoconnect']) infos['autoconnect'])
#default is checked #default is checked
self.xml.get_widget('sync_with_global_status_checkbutton').set_active(1) self.xml.get_widget('sync_with_global_status_checkbutton').set_active(True)
if infos.has_key('sync_with_global_status'): if infos.has_key('sync_with_global_status'):
self.xml.get_widget('sync_with_global_status_checkbutton').set_active(\ self.xml.get_widget('sync_with_global_status_checkbutton').set_active(\
infos['sync_with_global_status']) infos['sync_with_global_status'])
@ -1035,12 +1035,8 @@ class Account_modification_window:
list_no_log_for.append(name) list_no_log_for.append(name)
self.infos['no_log_for'] = ' '.join(list_no_log_for) self.infos['no_log_for'] = ' '.join(list_no_log_for)
sync_with_global_status = 0
if self.xml.get_widget('sync_with_global_status_checkbutton').\
get_active():
sync_with_global_status = 1
self.plugin.accounts[self.account]['sync_with_global_status'] = \ self.plugin.accounts[self.account]['sync_with_global_status'] = \
sync_with_global_status self.xml.get_widget('sync_with_global_status_checkbutton').get_active()
use_proxy = 0 use_proxy = 0
if self.xml.get_widget('use_proxy_checkbutton').get_active(): if self.xml.get_widget('use_proxy_checkbutton').get_active():
@ -1372,10 +1368,7 @@ class Accounts_window:
self.plugin.windows[account_modification_window].window.present() self.plugin.windows[account_modification_window].window.present()
def on_sync_with_global_status_checkbutton_toggled(self, widget): def on_sync_with_global_status_checkbutton_toggled(self, widget):
if widget.get_active(): self.plugin.accounts[account]['sync_with_global_status'] = widget.get_active()
self.plugin.accounts[account]['sync_with_global_status'] = 0
else:
self.plugin.accounts[account]['sync_with_global_status'] = 1
def __init__(self, plugin): def __init__(self, plugin):
self.plugin = plugin self.plugin = plugin

3
plugins/gtkgui/dialogs.py
View file

@ -625,6 +625,7 @@ class New_message_dialog:
"""When Chat button is clicked""" """When Chat button is clicked"""
jid = self.jid_entry.get_text() jid = self.jid_entry.get_text()
# use User class, new_chat expects it that way # use User class, new_chat expects it that way
# is it in the roster?
if not self.plugin.roster.contacts[self.account].has_key(jid): if not self.plugin.roster.contacts[self.account].has_key(jid):
user = gtkgui.User(jid, jid, ['not in the roster'], \ user = gtkgui.User(jid, jid, ['not in the roster'], \
'not in the roster', 'not in the roster', 'none', None, '', 0, '') 'not in the roster', 'not in the roster', 'none', None, '', 0, '')
@ -632,10 +633,12 @@ class New_message_dialog:
self.plugin.roster.add_user_to_roster(user.jid, self.account) self.plugin.roster.add_user_to_roster(user.jid, self.account)
else: else:
user = self.plugin.roster.contacts[self.account][jid][0] user = self.plugin.roster.contacts[self.account][jid][0]
if not self.plugin.windows[self.account]['chats'].has_key(jid): if not self.plugin.windows[self.account]['chats'].has_key(jid):
self.plugin.roster.new_chat(user, self.account) self.plugin.roster.new_chat(user, self.account)
self.plugin.windows[self.account]['chats'][jid].active_tab(jid) self.plugin.windows[self.account]['chats'][jid].active_tab(jid)
self.plugin.windows[self.account]['chats'][jid].window.present() self.plugin.windows[self.account]['chats'][jid].window.present()
widget.get_toplevel().destroy() widget.get_toplevel().destroy()
def __init__(self, plugin, account): def __init__(self, plugin, account):

2
plugins/gtkgui/roster_window.py
View file

@ -788,9 +788,11 @@ class roster_window:
tabbed_chat_window(user, self.plugin, account) tabbed_chat_window(user, self.plugin, account)
else: else:
self.plugin.windows[account]['chats']['tabbed'].new_user(user) self.plugin.windows[account]['chats']['tabbed'].new_user(user)
self.plugin.windows[account]['chats'][user.jid] = \ self.plugin.windows[account]['chats'][user.jid] = \
self.plugin.windows[account]['chats']['tabbed'] self.plugin.windows[account]['chats']['tabbed']
self.plugin.windows[account]['chats']['tabbed'].window.present() self.plugin.windows[account]['chats']['tabbed'].window.present()
else: else:
self.plugin.windows[account]['chats'][user.jid] = \ self.plugin.windows[account]['chats'][user.jid] = \
tabbed_chat_window(user, self.plugin, account) tabbed_chat_window(user, self.plugin, account)