Commits May 2008

commits@gajim.org

9 participants
181 discussions

[commit-gajim] r9669 - in trunk/src: . common
by js＠gajim.org 19 May '08

19 May '08

Author: js Date: 2008-05-19 19:41:51 +0200 (Mon, 19 May 2008) New Revision: 9669 Modified: trunk/src/common/connection.py trunk/src/message_control.py trunk/src/session.py Log: * When we receive a plaintext, non-tagged message, don't append OTR tag to outgoing messages anymore. Messages are not even passed to libotr anymore then. * If we don't support OTR, strip OTR tags from the message before displaying it. Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-05-19 14:24:34 UTC (rev 9668) +++ trunk/src/common/connection.py 2008-05-19 17:41:51 UTC (rev 9669) @@ -167,7 +167,8 @@ self.private_storage_supported = True if gajim.otr_module: - self.otr_userstates = gajim.otr_module.otrl_userstate_create() + self.otr_userstates = \ + gajim.otr_module.otrl_userstate_create() # END __init__ def put_event(self, ev): Modified: trunk/src/message_control.py =================================================================== --- trunk/src/message_control.py 2008-05-19 14:24:34 UTC (rev 9668) +++ trunk/src/message_control.py 2008-05-19 17:41:51 UTC (rev 9669) @@ -139,37 +139,47 @@ def send_message(self, message, keyID = '', type = 'chat', chatstate = None, msg_id = None, composing_xep = None, resource = None, user_nick = None): - '''Send the given message to the active tab. Doesn't return None if error - ''' + # Send the given message to the active tab. + # Doesn't return None if error jid = self.contact.jid original_message = message - if gajim.otr_module: + if gajim.otr_module and self.session.append_otr_tag: if type == 'chat' and isinstance(message, unicode): - d = {'kwargs':{'keyID':keyID, 'type':type, - 'chatstate':chatstate, 'msg_id':msg_id, - 'composing_xep':composing_xep, 'resource':self.resource, - 'user_nick':user_nick, 'session':self.session, - 'original_message':original_message}, 'account':self.account} + d = {'kwargs': {'keyID': keyID, 'type': type, + 'chatstate': chatstate, + 'msg_id': msg_id, + 'composing_xep': composing_xep, + 'resource': self.resource, + 'user_nick': user_nick, + 'session': self.session, + 'original_message': original_message}, + 'account': self.account} new_msg = gajim.otr_module.otrl_message_sending( - gajim.connections[self.account].otr_userstates, + self.session.conn.otr_userstates, (gajim.otr_ui_ops, d), - gajim.get_jid_from_account(self.account).encode(), - gajim.OTR_PROTO, self.contact.get_full_jid().encode(), - message.encode(), None, (gajim.otr_add_appdata, self.account)) + gajim.get_jid_from_account( + self.account).encode(), + gajim.OTR_PROTO, + self.contact.get_full_jid().encode(), + message.encode(), None, + (gajim.otr_add_appdata, self.account)) - context = gajim.otr_module.otrl_context_find( - gajim.connections[self.account].otr_userstates, - self.contact.get_full_jid().encode(), - gajim.get_jid_from_account(self.account).encode(), - gajim.OTR_PROTO, 1, (gajim.otr_add_appdata, - self.account))[0] + ctx = gajim.otr_module.otrl_context_find( + self.session.conn.otr_userstates, + self.contact.get_full_jid().encode(), + gajim.get_jid_from_account( + self.account).encode(), + gajim.OTR_PROTO, 1, + (gajim.otr_add_appdata, + self.account))[0] - # we send all because inject_message can filter on HTML stuff then + # we send all because inject_message can filter + # on HTML stuff then gajim.otr_module.otrl_message_fragment_and_send( - (gajim.otr_ui_ops, d), - context, new_msg, gajim.otr_module.OTRL_FRAGMENT_SEND_ALL) + (gajim.otr_ui_ops, d), ctx, new_msg, + gajim.otr_module.OTRL_FRAGMENT_SEND_ALL) return # Send and update history Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-05-19 14:24:34 UTC (rev 9668) +++ trunk/src/session.py 2008-05-19 17:41:51 UTC (rev 9669) @@ -18,6 +18,7 @@ stanza_session.EncryptedStanzaSession.__init__(self, conn, jid, thread_id, type = 'chat') self.control = None + self.append_otr_tag = True def acknowledge_termination(self): # the other party terminated the session. we'll keep the control around, though. @@ -151,6 +152,19 @@ if msgtxt == '': return + else: + self.append_otr_tag = False + + # We're also here if we just don't support OTR. + # Thus, we should strip the tags from plaintext + # messages since they look ugly. + msgtxt = msgtxt.replace('\x20\x09\x20\x20\x09' \ + '\x09\x09\x09\x20\x09\x20\x09\x20\x09' \ + '\x20\x20', '') + msgtxt = msgtxt.replace('\x20\x09\x20\x09\x20' \ + '\x20\x09\x20', '') + msgtxt = msgtxt.replace('\x20\x20\x09\x09\x20' \ + '\x20\x09\x20', '') else: log_type = 'single_msg_recv'

1 0

[commit-gajim] r9668 - trunk/src
by js＠gajim.org 19 May '08

19 May '08

Author: js Date: 2008-05-19 16:24:34 +0200 (Mon, 19 May 2008) New Revision: 9668 Modified: trunk/src/session.py Log: * Close our session when the remote end does. * Don't set encrypted = True if it was only a tagged plaintext msg. Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-05-19 13:52:45 UTC (rev 9667) +++ trunk/src/session.py 2008-05-19 14:24:34 UTC (rev 9668) @@ -90,6 +90,12 @@ (msgtxt.find('?OTR') != -1 or msgtxt.find( '\x20\x09\x20\x20\x09\x09\x09\x09' \ '\x20\x09\x20\x09\x20\x09\x20\x20') != -1): + # If it doesn't include ?OTR, it wasn't an + # encrypted message, but a tagged plaintext + # message. + if msgtxt.find('?OTR') != -1: + encrypted = True + # TODO: Do we really need .encode()? otr_msg_tuple = \ gajim.otr_module.otrl_message_receiving( @@ -108,14 +114,26 @@ if gajim.otr_module.otrl_tlv_find( otr_msg_tuple[2], gajim.otr_module.OTRL_TLV_DISCONNECTED) != None: - gajim.otr_ui_ops.gajim_log(_("%s " \ - "has ended his/her private " \ - "conversation with you; " \ - "should do the same.") % \ + gajim.otr_ui_ops.gajim_log(_('%s ' \ + 'has ended his/her private ' \ + 'conversation with you.') % \ full_jid_with_resource, self.conn.name, full_jid_with_resource.encode()) + # The other end closed the connection, + # so we do the same. + gajim.otr_module. \ + otrl_message_disconnect( + self.conn.otr_userstates, + (gajim.otr_ui_ops, + {'account': self.conn.name, + 'urgent': True}), + gajim.get_jid_from_account( + self.conn.name).encode(), + gajim.OTR_PROTO, + full_jid_with_resource.encode()) + if self.control: self.control.update_ui() @@ -131,8 +149,6 @@ tlvs = otr_msg_tuple[2] ctx.app_data.handle_tlv(tlvs) - encrypted = True - if msgtxt == '': return else:

1 0

[commit-gajim] r9667 - trunk/src
by js＠gajim.org 19 May '08

19 May '08

Author: js Date: 2008-05-19 15:52:45 +0200 (Mon, 19 May 2008) New Revision: 9667 Modified: trunk/src/gajim.py trunk/src/session.py Log: Fix automatic start of OTR session. Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-05-19 10:58:03 UTC (rev 9666) +++ trunk/src/gajim.py 2008-05-19 13:52:45 UTC (rev 9667) @@ -265,14 +265,13 @@ gajim.otr_module = None gajim.otr_windows = None -def add_appdata(data=None, context=None): +def add_appdata(data, context): account = data - context.app_data = otr_windows.ContactOtrSMPWindow(unicode(context.username), - account) + context.app_data = otr_windows.ContactOtrSMPWindow( + unicode(context.username), account) gajim.otr_add_appdata = add_appdata - def otr_dialog_destroy(widget, *args, **kwargs): widget.destroy() @@ -458,7 +457,7 @@ def max_message_size(self, **kwargs): return 0 - def account_name(self, opdata=None, account='',protocol=''): + def account_name(self, opdata=None, account='', protocol=''): return gajim.get_name_from_jid(opdata['account'], unicode(account)) Modified: trunk/src/session.py =================================================================== --- trunk/src/session.py 2008-05-19 10:58:03 UTC (rev 9666) +++ trunk/src/session.py 2008-05-19 13:52:45 UTC (rev 9667) @@ -82,9 +82,14 @@ log_type = 'chat_msg_recv' + # I don't trust libotr, that's why I only pass the + # message to it if it either contains the magic + # ?OTR string or a plaintext tagged message. if gajim.otr_module and \ isinstance(msgtxt, unicode) and \ - msgtxt.find('?OTR') != -1: + (msgtxt.find('?OTR') != -1 or msgtxt.find( + '\x20\x09\x20\x20\x09\x09\x09\x09' \ + '\x20\x09\x20\x09\x20\x09\x20\x20') != -1): # TODO: Do we really need .encode()? otr_msg_tuple = \ gajim.otr_module.otrl_message_receiving(

1 0

[commit-gajim] r9666 - in trunk: . src
by js＠gajim.org 19 May '08

19 May '08

Author: js Date: 2008-05-19 12:58:03 +0200 (Mon, 19 May 2008) New Revision: 9666 Modified: trunk/setup_win32.py trunk/src/gajim.py trunk/src/history_manager.py Log: * If found, automatically use included gtk on win32. * Don't include docutils stuff in win32 builds. Modified: trunk/setup_win32.py =================================================================== --- trunk/setup_win32.py 2008-05-19 00:17:39 UTC (rev 9665) +++ trunk/setup_win32.py 2008-05-19 10:58:03 UTC (rev 9666) @@ -20,18 +20,18 @@ from distutils.core import setup import py2exe import glob -import sys +import sys import os -sys.path.append('src') +sys.path.append('src') # Use local gtk folder instead of the one in PATH that is not latest gtk -if 'gtk' in os.listdir('.'): +if 'gtk' in os.listdir('.'): sys.path.append('gtk/bin') includes = ['encodings', 'encodings.utf-8',] opts = { 'py2exe': { - 'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,docutils.readers.*,docutils.writers.html4css1', + 'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*', #',docutils.readers.*,docutils.writers.html4css1', 'dll_excludes': [ 'iconv.dll','intl.dll','libatk-1.0-0.dll', 'libgdk_pixbuf-2.0-0.dll','libgdk-win32-2.0-0.dll', @@ -46,7 +46,7 @@ setup( name = 'Gajim', - version = '0.11.4', + version = '0.11.4.4-svn', description = 'A full featured Jabber client', author = 'Gajim Development Team', url = 'http://www.gajim.org/', Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-05-19 00:17:39 UTC (rev 9665) +++ trunk/src/gajim.py 2008-05-19 10:58:03 UTC (rev 9666) @@ -31,17 +31,18 @@ import warnings warnings.filterwarnings(action='ignore') -# Used to create windows installer with GTK included -# paths = os.environ['PATH'] -# list_ = paths.split(';') -# new_list = [] -# for p in list_: -# if p.find('gtk') < 0 and p.find('GTK') < 0: -# new_list.append(p) -# new_list.insert(0, 'gtk/lib') -# new_list.insert(0, 'gtk/bin') -# os.environ['PATH'] = ';'.join(new_list) -# os.environ['GTK_BASEPATH'] = 'gtk' + if os.path.isdir('gtk'): + # Used to create windows installer with GTK included + paths = os.environ['PATH'] + list_ = paths.split(';') + new_list = [] + for p in list_: + if p.find('gtk') < 0 and p.find('GTK') < 0: + new_list.append(p) + new_list.insert(0, 'gtk/lib') + new_list.insert(0, 'gtk/bin') + os.environ['PATH'] = ';'.join(new_list) + os.environ['GTK_BASEPATH'] = 'gtk' import sys Modified: trunk/src/history_manager.py =================================================================== --- trunk/src/history_manager.py 2008-05-19 00:17:39 UTC (rev 9665) +++ trunk/src/history_manager.py 2008-05-19 10:58:03 UTC (rev 9666) @@ -28,17 +28,18 @@ import warnings warnings.filterwarnings(action='ignore') -# Used to create windows installer with GTK included -# paths = os.environ['PATH'] -# list_ = paths.split(';') -# new_list = [] -# for p in list_: -# if p.find('gtk') < 0 and p.find('GTK') < 0: -# new_list.append(p) -# new_list.insert(0, 'gtk/lib') -# new_list.insert(0, 'gtk/bin') -# os.environ['PATH'] = ';'.join(new_list) -# os.environ['GTK_BASEPATH'] = 'gtk' + if os.path.isdir('gtk'): + # Used to create windows installer with GTK included + paths = os.environ['PATH'] + list_ = paths.split(';') + new_list = [] + for p in list_: + if p.find('gtk') < 0 and p.find('GTK') < 0: + new_list.append(p) + new_list.insert(0, 'gtk/lib') + new_list.insert(0, 'gtk/bin') + os.environ['PATH'] = ';'.join(new_list) + os.environ['GTK_BASEPATH'] = 'gtk' import sys import signal

1 0

[commit-gajim] r9665 - in trunk/src: . common common/zeroconf
by bct＠gajim.org 19 May '08

19 May '08

Author: bct Date: 2008-05-19 02:17:39 +0200 (Mon, 19 May 2008) New Revision: 9665 Modified: trunk/src/common/connection.py trunk/src/common/zeroconf/connection_zeroconf.py trunk/src/gajim.py Log: pass session when dispatching MSGNOTSENT Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2008-05-18 21:17:53 UTC (rev 9664) +++ trunk/src/common/connection.py 2008-05-19 00:17:39 UTC (rev 9665) @@ -1058,7 +1058,7 @@ if keyID == 'UNKNOWN': error = _('Neither the remote presence is signed, nor a key was assigned.') elif keyID[8:] == 'MISMATCH': - error = _('The contact\'s key (%s) does not match the key assigned in Gajim.' % keyID[:8]) + error = _('The contact\'s key (%s) does not match the key assigned in Gajim.' % keyID[:8]) else: #encrypt msgenc, error = self.gpg.encrypt(msg, [keyID]) @@ -1072,7 +1072,7 @@ else: # Encryption failed, do not send message tim = localtime() - self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim)) + self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session)) return 3 if msgtxt and not xhtml and gajim.config.get( 'rst_formatting_outgoing_messages'): Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2008-05-18 21:17:53 UTC (rev 9664) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2008-05-19 00:17:39 UTC (rev 9665) @@ -393,7 +393,7 @@ else: # Encryption failed, do not send message tim = time.localtime() - self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim)) + self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session)) return 3 if type == 'chat': Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2008-05-18 21:17:53 UTC (rev 9664) +++ trunk/src/gajim.py 2008-05-19 00:17:39 UTC (rev 9665) @@ -1014,9 +1014,9 @@ helpers.play_sound('message_sent') def handle_event_msgnotsent(self, account, array): - #('MSGNOTSENT', account, (jid, ierror_msg, msg, time)) + #('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session)) msg = _('error while sending %s ( %s )') % (array[2], array[1]) - self.roster.on_message(array[0], msg, array[3], account, + array[4].roster_message(array[0], msg, array[3], account, msg_type='error') def handle_event_subscribe(self, account, array):

1 0

[commit-gajim] r9664 - trunk/src
by bct＠gajim.org 18 May '08

18 May '08

Author: bct Date: 2008-05-18 23:17:53 +0200 (Sun, 18 May 2008) New Revision: 9664 Modified: trunk/src/notify.py Log: fix clicking on notification-daemon sign-in notification Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2008-05-18 21:15:58 UTC (rev 9663) +++ trunk/src/notify.py 2008-05-18 21:17:53 UTC (rev 9664) @@ -131,7 +131,7 @@ notif = gajim.config.get_per('notifications', str(num)) def notify(event, jid, account, parameters, advanced_notif_num = None): - '''Check what type of notifications we want, depending on basic + '''Check what type of notifications we want, depending on basic and the advanced configuration of notifications and do these notifications; advanced_notif_num holds the number of the first (top most) advanced notification''' @@ -198,8 +198,8 @@ if advanced_notif_num is not None and gajim.config.get_per('notifications', str(advanced_notif_num), 'run_command'): do_cmd = True - - # Do the wanted notifications + + # Do the wanted notifications if do_popup: if event in ('contact_connected', 'contact_disconnected', 'status_change'): # Common code for popup for these three events @@ -208,15 +208,15 @@ suffix = '_notif_size_bw.png' else: #Status Change or Connected # FIXME: for status change, - # we don't always 'online.png', but we + # we don't always 'online.png', but we # first need 48x48 for all status show_image = 'online.png' - suffix = '_notif_size_colored.png' + suffix = '_notif_size_colored.png' transport_name = gajim.get_transport_name_from_jid(jid) img = None if transport_name: img = os.path.join(helpers.get_transport_path(transport_name), - '48x48', show_image) + '48x48', show_image) if not img or not os.path.isfile(img): iconset = gajim.config.get('iconset') img = os.path.join(helpers.get_iconset_path(iconset), '48x48', @@ -340,12 +340,12 @@ path_to_image = os.path.abspath( os.path.join(gajim.DATA_DIR, 'pixmaps', 'events', 'chat_msg_recv.png')) # img to display - - + + notification = pynotify.Notification(title, text) timeout = gajim.config.get('notification_timeout') * 1000 # make it ms notification.set_timeout(timeout) - + notification.set_category(event_type) notification.set_data('event_type', event_type) notification.set_data('jid', jid) @@ -497,14 +497,14 @@ self.notif.Notify( dbus.String(_('Gajim')), dbus.String(self.path_to_image), - dbus.UInt32(0), - ntype, + dbus.UInt32(0), + ntype, dbus.Byte(0), dbus.String(self.title), dbus.String(self.text), [dbus.String(self.path_to_image)], - {'default': 0}, - [''], + {'default': 0}, + [''], True, dbus.UInt32(timeout), reply_handler=self.attach_by_id, @@ -530,16 +530,16 @@ dbus.UInt32(0), # this notification does not replace other dbus.String(self.path_to_image), dbus.String(self.title), - dbus.String(self.text), + dbus.String(self.text), ( dbus.String('default'), dbus.String(self.event_type) ), - hints, + hints, dbus.UInt32(timeout*1000), reply_handler=self.attach_by_id, error_handler=self.notify_another_way) else: self.notif.Notify( dbus.String(_('Gajim')), - dbus.String(self.path_to_image), + dbus.String(self.path_to_image), dbus.UInt32(0), dbus.String(self.title), dbus.String(self.text), @@ -563,8 +563,7 @@ return self.notif.CloseNotification(dbus.UInt32(id)) self.notif = None - if not self.msg_type: - self.msg_type = 'chat' + gajim.interface.handle_event(self.account, self.jid, self.msg_type) def version_reply_handler(self, name, vendor, version, spec_version = None):

1 0

[commit-gajim] r9663 - trunk/src
by js＠gajim.org 18 May '08

18 May '08

Author: js Date: 2008-05-18 23:15:58 +0200 (Sun, 18 May 2008) New Revision: 9663 Modified: trunk/src/chat_control.py Log: Coding style. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-05-18 21:14:59 UTC (rev 9662) +++ trunk/src/chat_control.py 2008-05-18 21:15:58 UTC (rev 9663) @@ -1421,8 +1421,8 @@ else: authenticated_string = '' - tooltip = ('%s Encryption %s active%s. \n' + \ - 'Your chat session %s be logged.') % \ + tooltip = '%s Encryption %s active%s.\n' \ + 'Your chat session %s be logged.' % \ (enc_type, status_string, authenticated_string, logged_string)

1 0

[commit-gajim] r9662 - trunk/src
by js＠gajim.org 18 May '08

18 May '08

Author: js Date: 2008-05-18 23:14:59 +0200 (Sun, 18 May 2008) New Revision: 9662 Modified: trunk/src/chat_control.py Log: Lock icon didn't show authenticated correctly. Fixed. Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2008-05-18 20:39:03 UTC (rev 9661) +++ trunk/src/chat_control.py 2008-05-18 21:14:59 UTC (rev 9662) @@ -1225,7 +1225,7 @@ def update_otr(self, print_status=False): otr_status_text = '' otr_status = self.get_otr_status() - authenticated = True + authenticated = False if otr_status > 0: enc_status = True

1 0

[commit-gajim] r9661 - trunk/src
by js＠gajim.org 18 May '08

18 May '08

Author: js Date: 2008-05-18 22:39:03 +0200 (Sun, 18 May 2008) New Revision: 9661 Modified: trunk/src/features_window.py Log: Link to the OTR wiki page in the features window. Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2008-05-18 19:51:58 UTC (rev 9660) +++ trunk/src/features_window.py 2008-05-18 20:39:03 UTC (rev 9661) @@ -101,8 +101,8 @@ _('Requires python-crypto.')), _('Off the Record Encryption'): (self.otr_available, _('Encrypting chatmessages in a way that even works through gateways.'), - _('Requires pyotr and libotr.'), - _('Requires pyotr and libotr.')), + _('Requires pyotr and libotr (see http://trac.gajim.org/wiki/OTR).'), + _('Requires pyotr and libotr (see http://trac.gajim.org/wiki/OTR).')), _('RST Generator'): (self.docutils_available, _('Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html).'), _('Requires python-docutils.'),

1 0

[commit-gajim] r9660 - trunk/src
by js＠gajim.org 18 May '08

18 May '08

Author: js Date: 2008-05-18 21:51:58 +0200 (Sun, 18 May 2008) New Revision: 9660 Modified: trunk/src/groupchat_control.py Log: This shoudl fix tab completion in GC. For real now, I hope. Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2008-05-18 19:44:43 UTC (rev 9659) +++ trunk/src/groupchat_control.py 2008-05-18 19:51:58 UTC (rev 9660) @@ -1886,7 +1886,7 @@ list_nick.insert(0, nick) list_nick.remove(self.nick) # Skip self - list_nick.reverse() + list_nick.sort() for nick in list_nick: if nick.lower().startswith(begin.lower()): # the word is the begining of a nick

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
19
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2008