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

use YESNO dialog for asking to reconnect, catch a keyerror and refactor code

Browse source
This commit is contained in:
Nikos Kouremenos 2006-02-27 16:14:14 +00:00
parent 3e2ec2495e
commit d38d64d05f
1 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/config.py
View file

@ -1,9 +1,9 @@
## config.py ## config.py
## ##
## Copyright (C) 2003-2006 Yann Le Boulanger <asterix@lagaule.org> ## Copyright (C) 2003-2006 Yann Le Boulanger <asterix@lagaule.org>
## Copyright (C) 2003-2005 Vincent Hanquez <tab@snarc.org>
## Copyright (C) 2005-2006 Nikos Kouremenos <nkour@jabber.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <nkour@jabber.org>
## Copyright (C) 2005 Dimitur Kirov <dkirov@gmail.com> ## Copyright (C) 2005 Dimitur Kirov <dkirov@gmail.com>
## Copyright (C) 2003-2005 Vincent Hanquez <tab@snarc.org>
## ##
## This program is free software; you can redistribute it and/or modify ## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published ## it under the terms of the GNU General Public License as published
@ -1119,11 +1119,21 @@ class AccountModificationWindow:
if self.account in list_no_log_for: if self.account in list_no_log_for:
self.xml.get_widget('log_history_checkbutton').set_active(0) self.xml.get_widget('log_history_checkbutton').set_active(0)
def opt_changed(self, opt, config): def option_changed(self, config, opt):
if gajim.config.get_per('accounts', self.account, opt) != config[opt]: if gajim.config.get_per('accounts', self.account, opt) != config[opt]:
return True return True
return False return False
def options_changed_need_relogin(self, config, options):
'''accepts configuration and options
(tupple of strings of the name of options changed)
and returns True or False depending on if at least one of the options
need relogin to server to apply'''
for option in options:
if self.option_changed(config, option):
return True
return False
def on_save_button_clicked(self, widget): def on_save_button_clicked(self, widget):
'''When save button is clicked: Save information in config file''' '''When save button is clicked: Save information in config file'''
config = {} config = {}
@ -1278,29 +1288,28 @@ class AccountModificationWindow:
gajim.config.add_per('accounts', name) gajim.config.add_per('accounts', name)
self.account = name self.account = name
if gajim.connections[self.account].connected != 0: if gajim.connections[self.account].connected == 0: # we're disconnected
# Check if relogin is needed relogin_needed = False
relog = False else: # we're connected to the account we want to apply changes
if self.opt_changed('priority', config): # check if relogin is needed
relog = True relogin_needed = self.options_changed_need_relogin(config,
elif self.opt_changed('proxy', config): ('priority', 'proxy', 'usessl', 'keyname',
relog = True 'use_custom_host', 'custom_host'))
elif self.opt_changed('usessl', config):
relog = True if config.has_key('use_custom_port') and config['use_custom_port']:
elif self.opt_changed('keyname', config): if self.option_changed(config, 'custom_host') or\
relog = True self.option_changed(config, 'custom_port'):
elif self.opt_changed('use_custom_host', config): relogin_needed = True
relog = True
elif config['use_custom_port']: if relogin_needed:
if self.opt_changed('custom_host', config) or self.opt_changed( dialog = dialogs.YesNoDialog(_('Relogin now?'),
'custom_port', config): _('If you want all the changes to apply instantly, '
relog = True 'you must relogin.'))
if relog: if dialog.get_response() == gtk.RESPONSE_YES:
dialog = dialogs.ConfirmationDialog(_('Relogin Now?'), do_relogin = True
_('Some of the options you changed needs a relogin to be taken ' else:
'into account. Do you want to relogin now?')) do_relogin = False
if dialog.get_response() != gtk.RESPONSE_OK:
relog = False
for opt in config: for opt in config:
gajim.config.set_per('accounts', name, opt, config[opt]) gajim.config.set_per('accounts', name, opt, config[opt])
if config['savepass']: if config['savepass']:
@ -1314,11 +1323,12 @@ class AccountModificationWindow:
gajim.interface.roster.draw_roster() gajim.interface.roster.draw_roster()
gajim.interface.save_config() gajim.interface.save_config()
self.window.destroy() self.window.destroy()
if relog:
if relogin_needed and do_relogin:
show_before = gajim.SHOW_LIST[gajim.connections[name].connected] show_before = gajim.SHOW_LIST[gajim.connections[name].connected]
status_before = gajim.connections[name].status status_before = gajim.connections[name].status
gajim.interface.roster.send_status(name, 'offline', gajim.interface.roster.send_status(name, 'offline',
_('Back in some minutes.')) _('Be right back.'))
gobject.timeout_add(500, gajim.interface.roster.send_status, name, gobject.timeout_add(500, gajim.interface.roster.send_status, name,
show_before, status_before) show_before, status_before)