diff --git a/src/common/connection.py b/src/common/connection.py index 00128e69e..974271a8a 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -698,8 +698,8 @@ class Connection(ConnectionHandlers): self.on_connect_failure = self._connect_failure self.connect() - def connect_and_init(self, show, msg, signe_msg): - self.continue_connect_info = [show, msg, signe_msg] + def connect_and_init(self, show, msg, sign_msg): + self.continue_connect_info = [show, msg, sign_msg] self.on_connect_auth = self._init_roster self.connect_and_auth() @@ -748,9 +748,9 @@ class Connection(ConnectionHandlers): if not msg: msg = '' keyID = gajim.config.get_per('accounts', self.name, 'keyid') - signe_msg = False + sign_msg = False if not auto and not show == 'offline': - signe_msg = True + sign_msg = True self.status = msg if show != 'offline' and not self.connected: # set old_show to requested 'show' in case we need to @@ -770,7 +770,7 @@ class Connection(ConnectionHandlers): gajim.config.set('usegpg', True) else: gajim.config.set('usegpg', False) - self.connect_and_init(show, msg, signe_msg) + self.connect_and_init(show, msg, sign_msg) elif show == 'offline': self.connected = 0 diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py index e11f3fcf0..0c7942db0 100644 --- a/src/common/connection_handlers.py +++ b/src/common/connection_handlers.py @@ -2130,9 +2130,9 @@ returns the session that we last sent a message to.''' # continue connection if self.connected > 1 and self.continue_connect_info: msg = self.continue_connect_info[1] - signe_msg = self.continue_connect_info[2] + sign_msg = self.continue_connect_info[2] signed = '' - if signe_msg: + if sign_msg: signed = self.get_signed_msg(msg, self._send_first_presence) if signed is None: self.dispatch('GPG_PASSWORD_REQUIRED', @@ -2144,8 +2144,8 @@ returns the session that we last sent a message to.''' def _send_first_presence(self, signed = ''): show = self.continue_connect_info[0] msg = self.continue_connect_info[1] - signe_msg = self.continue_connect_info[2] - if signe_msg and not signed: + sign_msg = self.continue_connect_info[2] + if sign_msg and not signed: signed = self.get_signed_msg(msg) if signed is None: self.dispatch('ERROR', (_('OpenPGP passphrase was not given'),