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

Don't process roster during gpg_passphrase dialog is showed. Fixes #3634, 

hopefully... :p Please test
This commit is contained in:
Jean-Marie Traissard 2007-12-27 17:06:30 +00:00
parent a467a1d48d
commit fb273aeadf
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/common/connection_handlers.py
View File

@ -2153,6 +2153,21 @@ returns the session that we last sent a message to.'''
raw_roster = roster.getRaw() raw_roster = roster.getRaw()
roster = {} roster = {}
our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name)) our_jid = helpers.parse_jid(gajim.get_jid_from_account(self.name))
if self.connected > 1 and self.continue_connect_info:
msg = self.continue_connect_info[1]
sign_msg = self.continue_connect_info[2]
signed = ''
send_first_presence = True
if sign_msg:
signed = self.get_signed_presence(msg, self._send_first_presence)
if signed is None:
self.dispatch('GPG_PASSWORD_REQUIRED',
(self._send_first_presence,))
# _send_first_presence will be called when user enter passphrase
send_first_presence = False
if send_first_presence:
self._send_first_presence(signed)
for jid in raw_roster: for jid in raw_roster:
try: try:
j = helpers.parse_jid(jid) j = helpers.parse_jid(jid)
@ -2175,20 +2190,6 @@ returns the session that we last sent a message to.'''
self.dispatch('ROSTER', roster) self.dispatch('ROSTER', roster)
# continue connection
if self.connected > 1 and self.continue_connect_info:
msg = self.continue_connect_info[1]
sign_msg = self.continue_connect_info[2]
signed = ''
if sign_msg:
signed = self.get_signed_presence(msg, self._send_first_presence)
if signed is None:
self.dispatch('GPG_PASSWORD_REQUIRED',
(self._send_first_presence,))
# _send_first_presence will be called when user enter passphrase
return
self._send_first_presence(signed)
def _send_first_presence(self, signed = ''): def _send_first_presence(self, signed = ''):
show = self.continue_connect_info[0] show = self.continue_connect_info[0]
msg = self.continue_connect_info[1] msg = self.continue_connect_info[1]