Commits October 2012

commits@gajim.org

3 participants
37 discussions

gajim: first thing to do when receiving a jingle stanza is to ac...
by Jefry Lagrange 12 Oct '12

12 Oct '12

changeset 73ede4f2f62c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=73ede4f2f62c description: first thing to do when receiving a jingle stanza is to acknowledge it diffstat: src/common/jingle_session.py | 29 +++++++++++++++-------------- 1 files changed, 15 insertions(+), 14 deletions(-) diffs (45 lines): diff -r a180b4e9890c -r 73ede4f2f62c src/common/jingle_session.py --- a/src/common/jingle_session.py Tue Oct 09 22:48:01 2012 -0400 +++ b/src/common/jingle_session.py Fri Oct 12 00:05:26 2012 -0400 @@ -105,26 +105,27 @@ # use .prepend() to add new callbacks, especially when you're going # to send error instead of ack self.callbacks = { - 'content-accept': [self.__on_content_accept, - self.__broadcast, self.__ack], - 'content-add': [self.__on_content_add, self.__broadcast, - self.__ack], #TODO + 'content-accept': [self.__ack, self.__on_content_accept, + self.__broadcast], + 'content-add': [self.__ack, + self.__on_content_add, self.__broadcast + ], #TODO 'content-modify': [self.__ack], #TODO 'content-reject': [self.__ack, self.__on_content_remove], 'content-remove': [self.__ack, self.__on_content_remove], - 'description-info': [self.__broadcast, self.__ack], #TODO + 'description-info': [self.__ack, self.__broadcast], #TODO 'security-info': [self.__ack], #TODO - 'session-accept': [self.__on_session_accept, + 'session-accept': [self.__ack, self.__on_session_accept, self.__on_content_accept, self.__broadcast], - 'session-info': [self.__broadcast, - self.__on_session_info, self.__ack], - 'session-initiate': [self.__on_session_initiate, - self.__broadcast, self.__ack], - 'session-terminate': [self.__on_session_terminate, - self.__broadcast_all, self.__ack], - 'transport-info': [self.__broadcast, self.__ack], - 'transport-replace': [self.__broadcast, + 'session-info': [self.__ack, self.__broadcast, + self.__on_session_info ], + 'session-initiate': [self.__ack, self.__on_session_initiate, + self.__broadcast], + 'session-terminate': [self.__ack,self.__on_session_terminate, + self.__broadcast_all], + 'transport-info': [self.__ack, self.__broadcast], + 'transport-replace': [self.__ack, self.__broadcast, self.__on_transport_replace], #TODO 'transport-accept': [self.__ack], #TODO 'transport-reject': [self.__ack], #TODO

1 0

gajim: fix getting info of file when receiving a file request
by Jefry Lagrange 10 Oct '12

10 Oct '12

changeset a180b4e9890c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a180b4e9890c description: fix getting info of file when receiving a file request diffstat: src/common/connection_handlers_events.py | 5 ++++- src/common/jingle.py | 4 +--- src/common/jingle_session.py | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) diffs (62 lines): diff -r c7a32812c477 -r a180b4e9890c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Oct 08 11:14:47 2012 +0200 +++ b/src/common/connection_handlers_events.py Tue Oct 09 22:48:01 2012 -0400 @@ -2001,9 +2001,12 @@ else: file_tag = desc.getTag('request').getTag('file') h = file_tag.getTag('hash') + h = h.getData() if h else None n = file_tag.getTag('name') + n = n.getData() if n else None pjid = gajim.get_jid_without_resource(self.fjid) - file_info = self.conn.get_file_info(pjid, hash_=h, name=n) + file_info = self.conn.get_file_info(pjid, hash_=h, + name=n,account=self.conn.name) self.file_props.file_name = file_info['file-name'] self.file_props.sender = self.conn._ft_get_our_jid() self.file_props.receiver = self.fjid diff -r c7a32812c477 -r a180b4e9890c src/common/jingle.py --- a/src/common/jingle.py Mon Oct 08 11:14:47 2012 +0200 +++ b/src/common/jingle.py Tue Oct 09 22:48:01 2012 -0400 @@ -161,7 +161,6 @@ return c.transport.sid def __hash_support(self, contact): - if contact.supports(xmpp.NS_HASHES): if contact.supports(xmpp.NS_HASHES_MD5): return 'md5' @@ -171,7 +170,6 @@ return 'sha-256' elif contact.supports(xmpp.NS_HASHES_SHA512): return 'sha-512' - return None def iter_jingle_sessions(self, jid, sid=None, media=None): @@ -194,7 +192,7 @@ # to be requested again. self.files.append(file_) - def get_file_info(self, peerjid, hash_=None, name=None): + def get_file_info(self, peerjid, hash_=None, name=None, account=None): if hash_: for f in self.files: # DEBUG #if f['hash'] == '1294809248109223': diff -r c7a32812c477 -r a180b4e9890c src/common/jingle_session.py --- a/src/common/jingle_session.py Mon Oct 08 11:14:47 2012 +0200 +++ b/src/common/jingle_session.py Tue Oct 09 22:48:01 2012 -0400 @@ -520,9 +520,12 @@ if request: self.request = True h = request.getTag('file').getTag('hash') + h = h.getData() if h else None n = request.getTag('file').getTag('name') + n = n.getData() if n else None pjid = gajim.get_jid_without_resource(self.peerjid) - file_info = self.connection.get_file_info(pjid, h, n) + file_info = self.connection.get_file_info(pjid, h, n, + self.connection.name) if not file_info: log.warning('The peer ' + pjid + \ ' is requesting a ' + \

1 0

gajim: prevent traceback when a wrong certificate is being check...
by Yann Leboulanger 08 Oct '12

08 Oct '12

changeset c7a32812c477 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c7a32812c477 description: prevent traceback when a wrong certificate is being checked. Fixes #7242 diffstat: src/common/check_X509.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (17 lines): diff -r ccef4ef8fe6b -r c7a32812c477 src/common/check_X509.py --- a/src/common/check_X509.py Sat Oct 06 19:07:48 2012 +0200 +++ b/src/common/check_X509.py Mon Oct 08 11:14:47 2012 +0200 @@ -133,7 +133,12 @@ for i in range(0, cnt): ext = cert.get_extension(i) if ext.get_short_name() == 'subjectAltName': - r = _parse_asn1(ext.get_data()) + try: + r = _parse_asn1(ext.get_data()) + except: + log.error('Wrong data in certificate: subjectAltName=%s' % \ + ext.get_data()) + continue if 'otherName' in r: if oid_xmppaddr in r['otherName']: for host in r['otherName'][oid_xmppaddr]:

1 0

gajim: prevent some traceback. see #7152
by Yann Leboulanger 06 Oct '12

06 Oct '12

changeset ccef4ef8fe6b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ccef4ef8fe6b description: prevent some traceback. see #7152 diffstat: src/roster_window.py | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diffs (66 lines): diff -r 12008ffd5492 -r ccef4ef8fe6b src/roster_window.py --- a/src/roster_window.py Sat Oct 06 19:06:56 2012 +0200 +++ b/src/roster_window.py Sat Oct 06 19:07:48 2012 +0200 @@ -5059,7 +5059,10 @@ """ When a row is added, set properties for icon renderer """ - type_ = model[titer][C_TYPE] + try: + type_ = model[titer][C_TYPE] + except TypeError: + return if type_ == 'account': self._set_account_row_background_color(renderer) renderer.set_property('xalign', 0) @@ -5089,8 +5092,11 @@ """ When a row is added, set properties for name renderer """ + try: + type_ = model[titer][C_TYPE] + except TypeError: + return theme = gajim.config.get('roster_theme') - type_ = model[titer][C_TYPE] if type_ == 'account': color = gajim.config.get_per('themes', theme, 'accounttextcolor') if color: @@ -5152,7 +5158,10 @@ """ When a row is added, draw the respective pep icon """ - type_ = model[titer][C_TYPE] + try: + type_ = model[titer][C_TYPE] + except TypeError: + return # allocate space for the icon only if needed if not model[titer][data]: @@ -5176,7 +5185,11 @@ """ When a row is added, set properties for avatar renderer """ - type_ = model[titer][C_TYPE] + try: + type_ = model[titer][C_TYPE] + except TypeError: + return + if type_ in ('group', 'account'): renderer.set_property('visible', False) return @@ -5208,7 +5221,11 @@ """ When a row is added, set properties for padlock renderer """ - type_ = model[titer][C_TYPE] + try: + type_ = model[titer][C_TYPE] + except TypeError: + return + # allocate space for the icon only if needed if type_ == 'account' and model[titer][C_PADLOCK_PIXBUF]: renderer.set_property('visible', True)

1 0

gajim: don't show Clear in received single message. Fixes #7244
by Yann Leboulanger 06 Oct '12

06 Oct '12

changeset 12008ffd5492 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=12008ffd5492 description: don't show Clear in received single message. Fixes #7244 diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 05861886349b -r 12008ffd5492 src/dialogs.py --- a/src/dialogs.py Thu Oct 04 22:25:07 2012 +0400 +++ b/src/dialogs.py Sat Oct 06 19:06:56 2012 +0200 @@ -2925,7 +2925,7 @@ self.conversation_scrolledwindow = self.xml.get_object( 'conversation_scrolledwindow') self.conversation_textview = conversation_textview.ConversationTextview( - account) + account, used_in_history_window=True) self.conversation_textview.tv.show() self.conversation_tv_buffer = self.conversation_textview.tv.get_buffer() self.xml.get_object('conversation_scrolledwindow').add(

1 0

gajim: [Darlan].Update Hebrew translation.
by Fomin Denis 04 Oct '12

04 Oct '12

changeset 05861886349b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=05861886349b description: [Darlan].Update Hebrew translation. diffstat: po/he.po | 1521 +++++++++++++++++++++++++++++++------------------------------ 1 files changed, 780 insertions(+), 741 deletions(-) diffs (truncated from 4040 to 300 lines): diff -r eede7f0239f8 -r 05861886349b po/he.po --- a/po/he.po Thu Oct 04 17:52:28 2012 +0200 +++ b/po/he.po Thu Oct 04 22:25:07 2012 +0400 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-17 22:54+0400\n" -"PO-Revision-Date: 2012-09-17 15:20+0200\n" +"POT-Creation-Date: 2012-10-04 21:59+0400\n" +"PO-Revision-Date: 2012-10-04 20:28+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -90,7 +90,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:6 msgid "Please choose one of the options below:" -msgstr "נא לבחור באחת מן האפשרויות הבאות:" +msgstr "נא לבחור באחת מן האפשרויות מטה:" # credentials #: ../data/gui/account_creation_wizard_window.ui.h:7 @@ -163,7 +163,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:20 #: ../data/gui/roster_window.ui.h:8 msgid "_Advanced" -msgstr "מת_קדם" +msgstr "_מתקדם" # הוספת אישור זה לרשימת האישורים המהימנים.\n # טביעת אצבע (מסוג) SHA1 של האישור:\n @@ -175,14 +175,13 @@ "הוספת תעודה זו אל רשימת התעודות המהימנות.\n" "טביעת אצבע SHA1 של התעודה:\n" -# מתחבר כעת #: ../data/gui/account_creation_wizard_window.ui.h:24 msgid "" "Connecting to server\n" "\n" "Please wait..." msgstr "" -"מתחבר אל השרת\n" +"מתחבר כעת אל שרת\n" "\n" "נא להמתין..." @@ -212,15 +211,15 @@ #: ../src/config.py:2320 #: ../src/config.py:2399 #: ../src/config.py:2412 -#: ../src/config.py:3697 -#: ../src/config.py:3772 +#: ../src/config.py:3698 +#: ../src/config.py:3773 #: ../src/dialogs.py:312 #: ../src/dialogs.py:314 #: ../src/dialogs.py:520 #: ../src/dialogs.py:533 -#: ../src/roster_window.py:3207 -#: ../src/roster_window.py:3213 -#: ../src/roster_window.py:3218 +#: ../src/roster_window.py:3214 +#: ../src/roster_window.py:3220 +#: ../src/roster_window.py:3225 msgid "None" msgstr "ללא" @@ -230,21 +229,21 @@ #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:3 -#: ../src/dialogs.py:3390 -#: ../src/dialogs.py:3436 +#: ../src/dialogs.py:3425 +#: ../src/dialogs.py:3471 msgid "Add" msgstr "הוספה" #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:4 -#: ../src/dialogs.py:3394 -#: ../src/dialogs.py:3491 +#: ../src/dialogs.py:3429 +#: ../src/dialogs.py:3526 msgid "Delete" msgstr "מחיקה" #. Rename #: ../data/gui/accounts_window.ui.h:5 -#: ../src/roster_window.py:5789 +#: ../src/roster_window.py:5827 msgid "Re_name" msgstr "_שינוי שם" @@ -401,9 +400,9 @@ #: ../src/common/contacts.py:135 #: ../src/dialogs.py:112 #: ../src/dialogs.py:124 -#: ../src/roster_window.py:3149 -#: ../src/roster_window.py:4246 -#: ../src/roster_window.py:5839 +#: ../src/roster_window.py:3156 +#: ../src/roster_window.py:4284 +#: ../src/roster_window.py:5877 msgid "General" msgstr "כללית" @@ -747,32 +746,30 @@ msgid "Yes" msgstr "כן" +# מועדפת #: ../data/gui/archiving_preferences_window.ui.h:3 -#, fuzzy msgid "Prefer" -msgstr "העדפות" - +msgstr "העדף" + +# Concession/Waive = ויתור #: ../data/gui/archiving_preferences_window.ui.h:4 msgid "Concede" -msgstr "" - +msgstr "וותר" + +# אסירה #: ../data/gui/archiving_preferences_window.ui.h:5 -#, fuzzy msgid "Forbid" -msgstr "אסירה" +msgstr "אסור" #: ../data/gui/archiving_preferences_window.ui.h:6 -#, fuzzy msgid "Method Manual" msgstr "שיטה ידנית" #: ../data/gui/archiving_preferences_window.ui.h:7 -#, fuzzy msgid "Method Local" msgstr "שיטה מקומית" #: ../data/gui/archiving_preferences_window.ui.h:8 -#, fuzzy msgid "Method Auto" msgstr "שיטה אוטומטית" @@ -802,6 +799,10 @@ msgid "Last modified:" msgstr "שונתה לאחרונה:" +#: ../data/gui/atom_entry_window.ui.h:6 +msgid "Next entry" +msgstr "רשומה באה" + #: ../data/gui/blocked_contacts_window.ui.h:1 msgid "Blocked Contacts" msgstr "אנשי־קשר חסומים" @@ -809,9 +810,9 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 #: ../data/gui/gc_occupants_menu.ui.h:14 -#: ../src/roster_window.py:5808 -#: ../src/roster_window.py:5935 -#: ../src/roster_window.py:6068 +#: ../src/roster_window.py:5846 +#: ../src/roster_window.py:5973 +#: ../src/roster_window.py:6106 msgid "_Unblock" msgstr "_ביטול חסימה" @@ -958,7 +959,7 @@ #: ../data/gui/chat_control.ui.h:12 #: ../data/gui/groupchat_control.ui.h:9 #: ../data/gui/xml_console_window.ui.h:15 -#: ../src/filetransfers_window.py:304 +#: ../src/filetransfers_window.py:322 msgid "_Send" msgstr "_שליחה" @@ -1016,7 +1017,7 @@ "You are going to begin a Multi-User Chat.\n" "Select the contacts you want to invite" msgstr "" -"בחרת להתחיל שיחה מרובות משתתפים.\n" +"בחרת להתחיל שיחה מרובת משתתפים.\n" "נא לבחור את אנשי־הקשר אותם ברצונך להזמין" # שרת MUC @@ -1050,8 +1051,8 @@ #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 #: ../data/gui/gc_occupants_menu.ui.h:11 -#: ../src/roster_window.py:5744 -#: ../src/roster_window.py:5903 +#: ../src/roster_window.py:5782 +#: ../src/roster_window.py:5941 msgid "In_vite to" msgstr "ה_זמנה אל" @@ -1072,8 +1073,8 @@ msgstr "הפעלת הצפנת E2E" #: ../data/gui/contact_context_menu.ui.h:8 -#: ../src/roster_window.py:5754 -#: ../src/roster_window.py:5992 +#: ../src/roster_window.py:5792 +#: ../src/roster_window.py:6030 msgid "Send Cus_tom Status" msgstr "שליחת מצב־חיבור מו_תאם" @@ -1127,9 +1128,9 @@ #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_occupants_menu.ui.h:13 -#: ../src/roster_window.py:5816 -#: ../src/roster_window.py:5941 -#: ../src/roster_window.py:6071 +#: ../src/roster_window.py:5854 +#: ../src/roster_window.py:5979 +#: ../src/roster_window.py:6109 msgid "_Block" msgstr "_חסימה" @@ -1149,7 +1150,7 @@ #: ../data/gui/gc_control_popup_menu.ui.h:9 #: ../data/gui/gc_occupants_menu.ui.h:15 #: ../data/gui/roster_window.ui.h:19 -#: ../src/roster_window.py:6142 +#: ../src/roster_window.py:6180 msgid "_History" msgstr "_היסטוריה" @@ -1247,12 +1248,13 @@ msgstr "הסתרת החלון" #: ../data/gui/filetransfers.ui.h:16 +#: ../src/filetransfers_window.py:905 msgid "_Continue" msgstr "ה_משך" #: ../data/gui/filetransfers.ui.h:17 -#: ../src/chat_control.py:3258 -#: ../src/filetransfers_window.py:214 +#: ../src/chat_control.py:3256 +#: ../src/filetransfers_window.py:213 msgid "_Open Containing Folder" msgstr "_פתיחת תיקיה מכילה" @@ -1524,7 +1526,7 @@ #: ../data/gui/item_archiving_preferences_window.ui.h:1 #, fuzzy msgid "expire" -msgstr "פג" +msgstr "פגה" #: ../data/gui/item_archiving_preferences_window.ui.h:2 #, fuzzy @@ -1532,25 +1534,28 @@ msgstr "שמירה" #: ../data/gui/item_archiving_preferences_window.ui.h:3 +#, fuzzy msgid "otr" msgstr "otr" # gajim-remote #: ../data/gui/item_archiving_preferences_window.ui.h:4 #: ../src/gajim-remote.py:229 +#, fuzzy msgid "jid" -msgstr "" +msgstr "jid" #: ../data/gui/item_archiving_preferences_window.ui.h:5 +#, fuzzy msgid "body" -msgstr "" +msgstr "גוף" #: ../data/gui/item_archiving_preferences_window.ui.h:6 +#, fuzzy msgid "false" -msgstr "" +msgstr "false" # gajim-remote -# הודעה #: ../data/gui/item_archiving_preferences_window.ui.h:7 #: ../src/gajim-remote.py:110 #: ../src/gajim-remote.py:133 @@ -1558,45 +1563,52 @@ #: ../src/gajim-remote.py:158 #: ../src/gajim-remote.py:169 #: ../src/gajim-remote.py:282 +#, fuzzy msgid "message"

1 0

gajim: gajim-remote handles ?message in URIs. Fixes #6804, see #...
by Yann Leboulanger 04 Oct '12

04 Oct '12

changeset eede7f0239f8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=eede7f0239f8 description: gajim-remote handles ?message in URIs. Fixes #6804, see #2133 Patch based on joeka's one in #6804 diffstat: src/gajim-remote.py | 54 ++++++++++++++++++++++++++++++++-------------------- 1 files changed, 33 insertions(+), 21 deletions(-) diffs (75 lines): diff -r f37abcc64bfb -r eede7f0239f8 src/gajim-remote.py --- a/src/gajim-remote.py Sun Sep 30 21:54:08 2012 +0200 +++ b/src/gajim-remote.py Thu Oct 04 17:52:28 2012 +0200 @@ -544,30 +544,42 @@ if not '?' in uri: self.command = sys.argv[1] = 'open_chat' return - if 'body=' in uri: - # Open chat window and paste the text in the input message dialog - self.command = sys.argv[1] = 'open_chat' - message = uri.split('body=') - message = message[1].split(';')[0] - try: - message = urllib.unquote(message) - except UnicodeDecodeError: - pass - sys.argv[2] = uri.split('?')[0] - if len(sys.argv) == 4: - # jid in the sys.argv - sys.argv.append(message) - else: - sys.argv.append('') - sys.argv.append(message) - sys.argv[3] = '' - sys.argv[4] = message - return - (jid, action) = uri.split('?', 1) + jid, args = uri.split('?', 1) try: jid = urllib.unquote(jid) except UnicodeDecodeError: pass + args = args.split(';') + action = None + options = {} + if args: + action = args[0] + for arg in args[1:]: + opt = arg.split('=', 1) + if len(opt) != 2: + continue + options[opt[0]] = opt[1] + + if action == 'message': + self.command = sys.argv[1] = 'open_chat' + sys.argv[2] = jid + if 'body' in options: + # Open chat window and paste the text in the input message + # dialog + message = options['body'] + try: + message = urllib.unquote(message) + except UnicodeDecodeError: + pass + if len(sys.argv) == 4: + # jid in the sys.argv + sys.argv.append(message) + else: + sys.argv.append('') + sys.argv.append(message) + sys.argv[3] = '' + sys.argv[4] = message + return sys.argv[2] = jid if action == 'join': self.command = sys.argv[1] = 'join_room' @@ -576,7 +588,7 @@ sys.argv.append(sys.argv[3]) sys.argv[3] = '' return - if action.startswith('roster'): + if action == 'roster': # Add contact to roster self.command = sys.argv[1] = 'add_contact' return

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2012