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

[Gustavo Carneiro] add GnomeKeyring support. see #2493

This commit is contained in:
Nikos Kouremenos 2006-10-05 23:06:54 +00:00
parent 005224518b
commit ebd6f65460
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/connection.py
View File

@ -30,6 +30,7 @@ import common.xmpp
from common import helpers from common import helpers
from common import gajim from common import gajim
from common import GnuPG from common import GnuPG
from common import passwords
from connection_handlers import * from connection_handlers import *
USE_GPG = GnuPG.USE_GPG USE_GPG = GnuPG.USE_GPG
@ -60,7 +61,7 @@ class Connection(ConnectionHandlers):
self.last_io = gajim.idlequeue.current_time() self.last_io = gajim.idlequeue.current_time()
self.last_sent = [] self.last_sent = []
self.last_history_line = {} self.last_history_line = {}
self.password = gajim.config.get_per('accounts', name, 'password') self.password = passwords.get_password(name)
self.server_resource = gajim.config.get_per('accounts', name, 'resource') self.server_resource = gajim.config.get_per('accounts', name, 'resource')
if gajim.config.get_per('accounts', self.name, 'keep_alives_enabled'): if gajim.config.get_per('accounts', self.name, 'keep_alives_enabled'):
self.keepalives = gajim.config.get_per('accounts', self.name,'keep_alive_every_foo_secs') self.keepalives = gajim.config.get_per('accounts', self.name,'keep_alive_every_foo_secs')

5
src/config.py
View File

@ -37,6 +37,7 @@ except:
from common import helpers from common import helpers
from common import gajim from common import gajim
from common import connection from common import connection
from common import passwords
#---------- PreferencesWindow class -------------# #---------- PreferencesWindow class -------------#
class PreferencesWindow: class PreferencesWindow:
@ -1454,9 +1455,9 @@ class AccountModificationWindow:
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']:
gajim.connections[name].password = config['password'] passwords.save_password(name, config['password'])
else: else:
gajim.connections[name].password = None passwords.save_password(name, None)
# refresh accounts window # refresh accounts window
if gajim.interface.instances.has_key('accounts'): if gajim.interface.instances.has_key('accounts'):
gajim.interface.instances['accounts'].init_accounts() gajim.interface.instances['accounts'].init_accounts()

4
src/roster_window.py
View File

@ -35,6 +35,7 @@ import notify
from common import gajim from common import gajim
from common import helpers from common import helpers
from common import passwords
from message_window import MessageWindowMgr from message_window import MessageWindowMgr
from chat_control import ChatControl from chat_control import ChatControl
from groupchat_control import GroupchatControl from groupchat_control import GroupchatControl
@ -2206,8 +2207,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
gajim.connections[account].password = passphrase gajim.connections[account].password = passphrase
if save: if save:
gajim.config.set_per('accounts', account, 'savepass', True) gajim.config.set_per('accounts', account, 'savepass', True)
gajim.config.set_per('accounts', account, 'password', passwords.save_password(account, passphrase)
passphrase)
keyid = None keyid = None
use_gpg_agent = gajim.config.get('use_gpg_agent') use_gpg_agent = gajim.config.get('use_gpg_agent')