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

fix GPG behaviour

Browse source
This commit is contained in:
Yann Leboulanger 2007-11-22 13:53:12 +00:00
parent 04e92485fc
commit 08e577c637
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/common/connection_handlers.py
View file

@ -2129,11 +2129,11 @@ returns the session that we last sent a message to.'''
# continue connection # continue connection
if self.connected > 1 and self.continue_connect_info: if self.connected > 1 and self.continue_connect_info:
to_be_signed = self.continue_connect_info[2] msg = self.continue_connect_info[1]
signe_msg = self.continue_connect_info[2]
signed = '' signed = ''
if to_be_signed: if signed_msg:
signed = self.get_signed_msg(to_be_signed, signed = self.get_signed_msg(signe_msg, self._send_first_presence)
self._send_first_presence)
if signed is None: if signed is None:
self.dispatch('GPG_PASSWORD_REQUIRED', self.dispatch('GPG_PASSWORD_REQUIRED',
(self._send_first_presence,)) (self._send_first_presence,))
@ -2144,9 +2144,9 @@ returns the session that we last sent a message to.'''
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]
to_be_signed = self.continue_connect_info[2] signe_msg = self.continue_connect_info[2]
if to_be_signed and not signed: if signed_msg and not signed:
signed = self.get_signed_msg(self.continue_connect_info[2]) signed = self.get_signed_msg(msg)
if signed is None: if signed is None:
self.dispatch('ERROR', (_('OpenPGP passphrase was not given'), self.dispatch('ERROR', (_('OpenPGP passphrase was not given'),
#%s is the account name here #%s is the account name here

2
src/gajim.py
View file

@ -2308,6 +2308,7 @@ class Interface:
emoticons_pattern_postmatch = '' emoticons_pattern_postmatch = ''
emoticon_length = 0 emoticon_length = 0
for emoticon in keys: # travel thru emoticons list for emoticon in keys: # travel thru emoticons list
emoticon = emoticon.decode('utf-8')
emoticon_escaped = re.escape(emoticon) # espace regexp metachars emoticon_escaped = re.escape(emoticon) # espace regexp metachars
emoticons_pattern += emoticon_escaped + '|'# | means or in regexp emoticons_pattern += emoticon_escaped + '|'# | means or in regexp
if (emoticon_length != len(emoticon)): if (emoticon_length != len(emoticon)):
@ -2409,6 +2410,7 @@ class Interface:
emots = emoticons.emoticons emots = emoticons.emoticons
for emot in emots: for emot in emots:
emot_file = os.path.join(path, emots[emot]) emot_file = os.path.join(path, emots[emot])
emot = emot.decode('utf-8')
if not self.image_is_ok(emot_file): if not self.image_is_ok(emot_file):
continue continue
# This avoids duplicated emoticons with the same image eg. :) and :-) # This avoids duplicated emoticons with the same image eg. :) and :-)