Author: jim++ Date: 2007-12-27 18:06:30 +0100 (Thu, 27 Dec 2007) New Revision: 9200

Modified: trunk/src/common/connection_handlers.py Log: Don't process roster during gpg_passphrase dialog is showed. Fixes #3634, hopefully... :p Please test

Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-12-27 15:53:42 UTC (rev 9199) +++ trunk/src/common/connection_handlers.py 2007-12-27 17:06:30 UTC (rev 9200) @@ -2153,6 +2153,21 @@ raw_roster = roster.getRaw() roster = {} 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: try: j = helpers.parse_jid(jid) @@ -2175,20 +2190,6 @@

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 = ''): show = self.continue_connect_info[0] msg = self.continue_connect_info[1]