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

use NEC to handle password-required events

This commit is contained in:
Yann Leboulanger 2010-11-29 10:00:23 +01:00
parent 2fe47c045b
commit 04b89bc473
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/connection.py
View File

@ -2287,7 +2287,7 @@ class Connection(CommonConnection, ConnectionHandlers):
if self.password: if self.password:
self.set_password(self.password) self.set_password(self.password)
return return
self.dispatch('PASSWORD_REQUIRED', None) gajim.nec.push_incoming_event(PasswordRequiredEvent(None, conn=self))
def set_password(self, password): def set_password(self, password):
self.password = password self.password = password

4
src/common/connection_handlers_events.py
View File

@ -1558,3 +1558,7 @@ class MetacontactsReceivedEvent(nec.NetworkIncomingEvent):
class ZeroconfNameConflictEvent(nec.NetworkIncomingEvent): class ZeroconfNameConflictEvent(nec.NetworkIncomingEvent):
name = 'zeroconf-name-conflict' name = 'zeroconf-name-conflict'
base_network_events = [] base_network_events = []
class PasswordRequiredEvent(nec.NetworkIncomingEvent):
name = 'password-required'
base_network_events = []

7
src/gui_interface.py
View File

@ -696,8 +696,9 @@ class Interface:
'this message?'), checktext=_('_Do not ask me again'), 'this message?'), checktext=_('_Do not ask me again'),
on_response_yes=on_yes, on_response_no=on_no) on_response_yes=on_yes, on_response_no=on_no)
def handle_event_password_required(self, account, array): def handle_event_password_required(self, obj):
#('PASSWORD_REQUIRED', account, None) #('PASSWORD_REQUIRED', account, None)
account = obj.conn.name
if account in self.pass_dialog: if account in self.pass_dialog:
return return
text = _('Enter your password for account %s') % account text = _('Enter your password for account %s') % account
@ -711,7 +712,7 @@ class Interface:
if save: if save:
gajim.config.set_per('accounts', account, 'savepass', True) gajim.config.set_per('accounts', account, 'savepass', True)
passwords.save_password(account, passphrase) passwords.save_password(account, passphrase)
gajim.connections[account].set_password(passphrase) obj.conn.set_password(passphrase)
del self.pass_dialog[account] del self.pass_dialog[account]
def on_cancel(): def on_cancel():
@ -1420,7 +1421,6 @@ class Interface:
'FILE_SEND_ERROR': [self.handle_event_file_send_error], 'FILE_SEND_ERROR': [self.handle_event_file_send_error],
'SIGNED_IN': [self.handle_event_signed_in], 'SIGNED_IN': [self.handle_event_signed_in],
'FAILED_DECRYPT': [self.handle_event_failed_decrypt], 'FAILED_DECRYPT': [self.handle_event_failed_decrypt],
'PASSWORD_REQUIRED': [self.handle_event_password_required],
'atom-entry-received': [self.handle_atom_entry], 'atom-entry-received': [self.handle_atom_entry],
'bad-gpg-passphrase': [self.handle_event_bad_gpg_passphrase], 'bad-gpg-passphrase': [self.handle_event_bad_gpg_passphrase],
'bookmarks-received': [self.handle_event_bookmarks], 'bookmarks-received': [self.handle_event_bookmarks],
@ -1448,6 +1448,7 @@ class Interface:
'muc-admin-received': [self.handle_event_gc_affiliation], 'muc-admin-received': [self.handle_event_gc_affiliation],
'muc-owner-received': [self.handle_event_gc_config], 'muc-owner-received': [self.handle_event_gc_config],
'our-show': [self.handle_event_status], 'our-show': [self.handle_event_status],
'password-required': [self.handle_event_password_required],
'plain-connection': [self.handle_event_plain_connection], 'plain-connection': [self.handle_event_plain_connection],
'presence-received': [self.handle_event_presence], 'presence-received': [self.handle_event_presence],
'roster-info': [self.handle_event_roster_info], 'roster-info': [self.handle_event_roster_info],