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

gpgpass option becomes gpgpassword

This commit is contained in:
Yann Leboulanger 2005-01-06 12:44:50 +00:00
parent 0984049458
commit c78ff29ce7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/gtkgui/config.py
View File

@ -568,9 +568,9 @@ class accountPreference_Window:
infos['savegpgpass']) infos['savegpgpass'])
if infos['savegpgpass']: if infos['savegpgpass']:
self.xml.get_widget('gpg_pass_entry').set_sensitive(True) self.xml.get_widget('gpg_pass_entry').set_sensitive(True)
if infos.has_key('gpgpass'): if infos.has_key('gpgpassword'):
self.xml.get_widget('gpg_pass_entry').set_text(\ self.xml.get_widget('gpg_pass_entry').set_text(\
infos['gpgpass']) infos['gpgpassword'])
if infos.has_key('autoconnect'): if infos.has_key('autoconnect'):
self.xml.get_widget('chk_autoconnect').set_active(\ self.xml.get_widget('chk_autoconnect').set_active(\
infos['autoconnect']) infos['autoconnect'])
@ -667,7 +667,7 @@ class accountPreference_Window:
'autoconnect': autoconnect, 'use_proxy': useProxy, 'proxyhost': \ 'autoconnect': autoconnect, 'use_proxy': useProxy, 'proxyhost': \
entryProxyhost.get_text(), 'proxyport': proxyPort, 'keyid': keyID, \ entryProxyhost.get_text(), 'proxyport': proxyPort, 'keyid': keyID, \
'keyname': keyName, 'savegpgpass': save_gpg_pass, \ 'keyname': keyName, 'savegpgpass': save_gpg_pass, \
'gpgpass': gpg_pass, 'active': active} 'gpgpassword': gpg_pass, 'active': active}
self.plugin.send('CONFIG', None, ('accounts', self.plugin.accounts, \ self.plugin.send('CONFIG', None, ('accounts', self.plugin.accounts, \
'GtkGui')) 'GtkGui'))
#refresh accounts window #refresh accounts window
@ -693,7 +693,7 @@ class accountPreference_Window:
entryRessource.get_text(), 'priority' : prio, 'autoconnect': \ entryRessource.get_text(), 'priority' : prio, 'autoconnect': \
autoconnect, 'use_proxy': useProxy, 'proxyhost': \ autoconnect, 'use_proxy': useProxy, 'proxyhost': \
entryProxyhost.get_text(), 'proxyport': proxyPort, 'keyid': keyID, \ entryProxyhost.get_text(), 'proxyport': proxyPort, 'keyid': keyID, \
'keyname': keyName, 'savegpgpass': save_gpg_pass, 'gpgpass': gpg_pass,\ 'keyname': keyName, 'savegpgpass': save_gpg_pass, 'gpgpassword': gpg_pass,\
'active': 1} 'active': 1}
self.plugin.send('CONFIG', None, ('accounts', self.plugin.accounts, \ self.plugin.send('CONFIG', None, ('accounts', self.plugin.accounts, \
'GtkGui')) 'GtkGui'))

2
plugins/gtkgui/gtkgui.py
View File

@ -1402,7 +1402,7 @@ class roster_Window:
if keyid and not self.plugin.connected[account] and \ if keyid and not self.plugin.connected[account] and \
self.plugin.config['usegpg']: self.plugin.config['usegpg']:
if save_gpg_pass: if save_gpg_pass:
passphrase = self.plugin.accounts[account]['gpgpass'] passphrase = self.plugin.accounts[account]['gpgpassword']
else: else:
passphrase = '' passphrase = ''
w = passphrase_Window('Enter your passphrase for your the GPG key of your account %s' % account, autoconnect) w = passphrase_Window('Enter your passphrase for your the GPG key of your account %s' % account, autoconnect)