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

signe -> sign

Browse source
This commit is contained in:
Yann Leboulanger 2007-11-22 14:05:05 +00:00
parent 8722df168c
commit 5fb061478f
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/common/connection.py
View file

@ -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

8
src/common/connection_handlers.py
View file

@ -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'),