Commits May 2015

commits@gajim.org

1 participants
15 discussions

gajim: fix typo. Raise correct exception. Fixes #8044
by Gajim 17 May '15

17 May '15

changeset befdb44a7c2c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=befdb44a7c2c description: fix typo. Raise correct exception. Fixes #8044 diffstat: src/common/jingle_ft.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b263427cbf95 -r befdb44a7c2c src/common/jingle_ft.py --- a/src/common/jingle_ft.py Sun May 17 21:56:17 2015 +0200 +++ b/src/common/jingle_ft.py Sun May 17 22:38:26 2015 +0200 @@ -253,7 +253,7 @@ candUsed = content.getTag('transport').getTag('candidate-used') if (candError or candUsed) and \ self.state >= STATE_CAND_SENT_AND_RECEIVED: - raise nbxmpp.OutOfOrder + raise nbxmpp.NodeProcessed if candError: if not gajim.socks5queue.listener.connections: gajim.socks5queue.listener.disconnect()

1 0

gajim: [Darlan] updated hebrew translation
by Gajim 17 May '15

17 May '15

changeset aea1c67bffab in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=aea1c67bffab description: [Darlan] updated hebrew translation diffstat: po/he.po | 2383 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 1185 insertions(+), 1198 deletions(-) diffs (truncated from 6348 to 300 lines): diff -r 6bfa0d9196b4 -r aea1c67bffab po/he.po --- a/po/he.po Sun May 17 18:54:17 2015 +0200 +++ b/po/he.po Sun May 17 20:22:58 2015 +0200 @@ -2,13 +2,13 @@ # Copyright (C) Copyright © 2003-2013 Gajim Team # This file is distributed under the same license as the gajim package. # Darlan <xmpp:israeli@failar.nu>, 2012 - 2013. -# Isratine Citizen <genghiskhan(a)gmx.ca>, 2012 - 2013. +# Isratine Citizen <genghiskhan(a)gmx.ca>, 2012 - 2015. # msgid "" msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-28 13:21+0200\n" +"POT-Creation-Date: 2015-05-17 20:19+0200\n" "PO-Revision-Date: 2014-06-21 16:23+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" @@ -18,11 +18,13 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.5.4\n" +"X-Language: he\n" +"X-Source-Language: en\n" #: ../data/gui/account_context_menu.ui.h:1 #: ../data/gui/zeroconf_context_menu.ui.h:1 msgid "_Status" -msgstr "_מצב חיבור" +msgstr "_מצב" #: ../data/gui/account_context_menu.ui.h:2 msgid "_Personal Events" @@ -31,9 +33,8 @@ #: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 #: ../data/gui/systray_context_menu.ui.h:2 msgid "_Start Chat..." -msgstr "התחלת _שיחה..." - -# אל שיחת +msgstr "התחל _שיחה..." + #: ../data/gui/account_context_menu.ui.h:4 #: ../data/gui/chat_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:5 #: ../data/gui/systray_context_menu.ui.h:3 @@ -42,7 +43,7 @@ #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." -msgstr "הוספת _איש קשר..." +msgstr "הוסף _איש קשר..." # איתור #: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7 @@ -51,7 +52,7 @@ #: ../data/gui/account_context_menu.ui.h:7 msgid "_Execute Command..." -msgstr "הרצת _פקודה..." +msgstr "הרץ _פקודה..." #: ../data/gui/account_context_menu.ui.h:8 msgid "_Open Gmail Inbox" @@ -60,7 +61,7 @@ #: ../data/gui/account_context_menu.ui.h:9 #: ../data/gui/zeroconf_context_menu.ui.h:2 msgid "_Modify Account..." -msgstr "ה_תאמת חשבון..." +msgstr "ה_תאם חשבון..." #: ../data/gui/account_creation_wizard_window.ui.h:1 msgid "Gajim: Account Creation Wizard" @@ -72,7 +73,7 @@ "to the Jabber network." msgstr "" "יש צורך בחשבון בכדי להתחבר\n" -"אל רשת התקשורת Jabber." +"לרשת Jabber." #: ../data/gui/account_creation_wizard_window.ui.h:4 msgid "I already have an account I want to _use" @@ -89,7 +90,7 @@ # credentials #: ../data/gui/account_creation_wizard_window.ui.h:7 msgid "Please fill in the data for your existing account" -msgstr "אנא מלא את נתוני ההתחברות בשביל חשבונך הקיים" +msgstr "אנא מלא נתוני התחברות בשביל חשבונך הקיים" #: ../data/gui/account_creation_wizard_window.ui.h:8 #: ../data/gui/accounts_window.ui.h:22 @@ -133,7 +134,7 @@ # BUG: _underline #: ../data/gui/account_creation_wizard_window.ui.h:16 msgid "Manage..." -msgstr " ניהול... " +msgstr " נהל... " # BUG: _underline #: ../data/gui/account_creation_wizard_window.ui.h:17 @@ -158,7 +159,7 @@ "Add this certificate to the list of trusted certificates.\n" "SHA1 fingerprint of the certificate:\n" msgstr "" -"הוסף את תעודה זו אל רשימת התעודות המהימנות.\n" +"הוסף את תעודה זו לרשימת התעודות המהימנות.\n" "טביעת אצבע SHA1 של התעודה:\n" #: ../data/gui/account_creation_wizard_window.ui.h:24 @@ -167,13 +168,13 @@ "\n" "Please wait..." msgstr "" -"כעת מתחבר אל שרת\n" +"כעת מתחבר לשרת\n" "\n" "אנא המתן..." #: ../data/gui/account_creation_wizard_window.ui.h:27 msgid "Connect when I press Finish" -msgstr "התחבר כאשר אני אלחץ על לחצן סיים" +msgstr "התחבר כאשר אני אלחץ על סיים" #: ../data/gui/account_creation_wizard_window.ui.h:28 msgid "Set my profile when I connect" @@ -186,12 +187,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:30 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 #: ../src/config.py:1258 ../src/config.py:1273 ../src/config.py:1278 -#: ../src/config.py:1326 ../src/config.py:1429 ../src/config.py:1748 -#: ../src/config.py:1753 ../src/config.py:2348 ../src/config.py:2430 -#: ../src/config.py:2445 ../src/config.py:3740 ../src/config.py:3815 +#: ../src/config.py:1326 ../src/config.py:1429 ../src/config.py:1750 +#: ../src/config.py:1755 ../src/config.py:2358 ../src/config.py:2440 +#: ../src/config.py:2455 ../src/config.py:3751 ../src/config.py:3826 #: ../src/dialogs.py:316 ../src/dialogs.py:318 ../src/dialogs.py:524 -#: ../src/dialogs.py:537 ../src/roster_window.py:3161 -#: ../src/roster_window.py:3167 ../src/roster_window.py:3172 +#: ../src/dialogs.py:537 ../src/roster_window.py:3188 +#: ../src/roster_window.py:3194 ../src/roster_window.py:3199 msgid "None" msgstr "ללא" @@ -200,14 +201,14 @@ msgstr "חשבונות" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3534 -#: ../src/dialogs.py:3580 +#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3542 +#: ../src/dialogs.py:3588 msgid "Add" msgstr "הוסף" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3538 -#: ../src/dialogs.py:3635 +#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3546 +#: ../src/dialogs.py:3643 msgid "Delete" msgstr "מחק" @@ -215,7 +216,7 @@ msgid "Re_name" msgstr "_שנה שם" -#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4188 +#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4199 #: ../src/plugins/gui.py:92 msgid "Active" msgstr "פעיל" @@ -232,16 +233,16 @@ "account with resource 'Home' and 'Work' at the same time. The resource which " "has the highest priority will get the events. (see below)" msgstr "" -"משאב נשלח אל שרת Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, " -"בהסתמך על מספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהיה " -"מחובר אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה " -"העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" +"משאב נשלח לשרת Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, " +"בהסתמך על מספר הלקוחות שמחוברים לאותו השרת עם אותו החשבון. כך שייתכן כי תהיה " +"מחובר לאותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו ניתנה " +"העדיפות הגבוהה ביותר יקבל את האירועים. (ראה למטה)" # In Hebrew: גאג'ים #. No configured account #: ../data/gui/accounts_window.ui.h:9 ../data/gui/roster_window.ui.h:1 -#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1168 -#: ../src/common/helpers.py:1180 ../src/notify.py:316 ../src/notify.py:339 +#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1178 +#: ../src/common/helpers.py:1190 ../src/notify.py:316 ../src/notify.py:339 #: ../src/notify.py:389 ../src/notify.py:405 msgid "Gajim" msgstr "‫Gajim" @@ -277,17 +278,17 @@ "server when two or more clients are connected using the same account; The " "client with the highest priority gets the events" msgstr "" -"עדיפת משמשת את Jabber כדי לקבוע מי מקבל את האירועים מתוך שרת jabber כאשר שני " +"עדיפת משמשת את Jabber כדי לקבוע מי מקבל אירועים מתוך שרת jabber כאשר שני " "לקוחות או יותר מחוברים באמצעות אותו החשבון; הלקוח בעל העדיפות הגבוהה ביותר " -"יקבל את האירועים" +"יקבל אירועים" #: ../data/gui/accounts_window.ui.h:16 msgid "A_djust to status" -msgstr "_התאם אל מצב חיבור" +msgstr "_התאם למצב" #: ../data/gui/accounts_window.ui.h:17 msgid "Priority will change automatically according to your status." -msgstr "העדיפות תשתנה אוטומטית בהתאם אל מצב החיבור שלך." +msgstr "העדיפות תשתנה אוטומטית בהתאם למצב שלך." #: ../data/gui/accounts_window.ui.h:18 msgid "Priori_ty:" @@ -303,7 +304,7 @@ #: ../data/gui/accounts_window.ui.h:25 msgid "Browse..." -msgstr " עיון... " +msgstr " עיין... " #: ../data/gui/accounts_window.ui.h:26 msgid "Certificate is e_ncrypted" @@ -341,7 +342,7 @@ #: ../data/gui/accounts_window.ui.h:33 msgid "Synch_ronize account status with global status" -msgstr "סנכרן מצב חשבון עם מצב חיבור _גלובלי" +msgstr "סנכרן מצב חשבון עם מצב _גלובלי" # BUG: a dot at the end # תיבת אפשרויות @@ -355,65 +356,70 @@ "bottom of the roster window) will change the status of this account " "accordingly" msgstr "" -"כאשר מסומן, כל שינוי אל מצב החיבור הגלובלי (מטופל על ידי תיבת הבחירה שמצויה " -"בתחתית חלון הרשימה) ישנה את המצב של חשבון זה בהתאמה" +"כאשר מסומן, כל שינוי למצב גלובלי (מטופל על ידי תיבת בחירה אשר מצויה בתחתית " +"חלון הרשימה) ישנה את המצב של חשבון זה בהתאמה" + +#: ../data/gui/accounts_window.ui.h:35 +msgid "Receive conversations from other resources (If server supports it)" +msgstr "קבל דיונים מתוך מקורות אחרים (אם שרת תומך זאת)" # BUG: _underline -#: ../data/gui/accounts_window.ui.h:35 +#: ../data/gui/accounts_window.ui.h:36 msgid "Use file transfer proxies" msgstr "השתמש בצירי העברת קובץ" -#: ../data/gui/accounts_window.ui.h:36 +#: ../data/gui/accounts_window.ui.h:37 msgid "" "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." msgstr "" -"כאשר מסומן, Gajim ישדר, בנוסף לכתובת פרוטוקול המרשתת (IP; ‏Internet Protocol) " -"שלך, מספר כתובות IP נוספות, כך שלהעברת קובץ יהיו סיכויים גדולים יותר לעבוד." +"כאשר מסומן, Gajim ישדר, בנוסף לכתובת IP שלך, מספר כתובות IP נוספות, כך " +"שלהעברת קובץ יהיו סיכויים גדולים יותר לעבוד." # (קבוצה כללית) +#. nick choosen by contact #. FIXME: Ugly workaround. #. FIXME: Ugly workaround. #. Maybe we haven't been in any group (defaults to General) #. General group cannot be changed -#: ../data/gui/accounts_window.ui.h:37 ../data/gui/preferences_window.ui.h:41 -#: ../src/common/contacts.py:135 ../src/dialogs.py:116 ../src/dialogs.py:128 -#: ../src/roster_window.py:3103 ../src/roster_window.py:4229 -#: ../src/roster_window.py:5874 +#: ../data/gui/accounts_window.ui.h:38 ../data/gui/preferences_window.ui.h:41 +#: ../src/common/contacts.py:102 ../src/common/contacts.py:135 +#: ../src/dialogs.py:116 ../src/dialogs.py:128 ../src/roster_window.py:3130 +#: ../src/roster_window.py:4260 ../src/roster_window.py:5908 msgid "General" msgstr "כללית" -#: ../data/gui/accounts_window.ui.h:38 +#: ../data/gui/accounts_window.ui.h:39 msgid "_use HTTP__PROXY environment variable" msgstr "השתמש במשת_ני סביבת HTTP__PROXY" -#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:134 +#: ../data/gui/accounts_window.ui.h:40 ../data/gui/preferences_window.ui.h:134 msgid "_Manage..." -msgstr " ניהו_ל... " - -#: ../data/gui/accounts_window.ui.h:40 +msgstr " נה_ל... " + +#: ../data/gui/accounts_window.ui.h:41 msgid "Proxy" msgstr "פרוקסי" -#: ../data/gui/accounts_window.ui.h:41 +#: ../data/gui/accounts_window.ui.h:42

1 0

gajim: print subject from received messages correctly. Fixes #8042
by Gajim 17 May '15

17 May '15

changeset b263427cbf95 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b263427cbf95 description: print subject from received messages correctly. Fixes #8042 diffstat: src/conversation_textview.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diffs (27 lines): diff -r aea1c67bffab -r b263427cbf95 src/conversation_textview.py --- a/src/conversation_textview.py Sun May 17 20:22:58 2015 +0200 +++ b/src/conversation_textview.py Sun May 17 21:56:17 2015 +0200 @@ -1216,10 +1216,11 @@ puny_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in puny_tags] buffer_.insert_with_tags(end_iter, " (%s)" % puny_text, *puny_tags) - def print_empty_line(self): + def print_empty_line(self, iter_=None): buffer_ = self.tv.get_buffer() - end_iter = buffer_.get_end_iter() - buffer_.insert_with_tags_by_name(end_iter, '\n', 'eol') + if not iter_: + iter_ = buffer_.get_end_iter() + buffer_.insert_with_tags_by_name(iter_, '\n', 'eol') self.just_cleared = False def print_conversation_line(self, text, jid, kind, name, tim, @@ -1446,7 +1447,7 @@ else: end_iter = buffer_.get_end_iter() buffer_.insert(end_iter, subject) - self.print_empty_line() + self.print_empty_line(end_iter) def print_real_text(self, text, text_tags=[], name=None, xhtml=None, graphics=True, iter_=None):

1 0

gajim: update python-gnupg version. Fixes #8051
by Gajim 17 May '15

17 May '15

changeset 6bfa0d9196b4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=6bfa0d9196b4 description: update python-gnupg version. Fixes #8051 diffstat: src/common/gnupg.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diffs (45 lines): diff -r a6560ca0a485 -r 6bfa0d9196b4 src/common/gnupg.py --- a/src/common/gnupg.py Sun May 17 15:40:42 2015 +0200 +++ b/src/common/gnupg.py Sun May 17 18:54:17 2015 +0200 @@ -229,7 +229,7 @@ "DECRYPTION_OKAY", "INV_SGNR", "FILE_START", "FILE_ERROR", "FILE_DONE", "PKA_TRUST_GOOD", "PKA_TRUST_BAD", "BADMDC", "GOODMDC", "NO_SGNR", "NOTATION_NAME", "NOTATION_DATA", - "PROGRESS"): + "PROGRESS", "PINENTRY_LAUNCHED", "NEWSIG"): pass elif key == "BADSIG": self.valid = False @@ -509,7 +509,8 @@ def handle_status(self, key, value): if key in ("ENC_TO", "USERID_HINT", "GOODMDC", "END_DECRYPTION", "BEGIN_SIGNING", "NO_SECKEY", "ERROR", "NODATA", "PROGRESS", - "CARDCTRL", "BADMDC", "SC_OP_FAILURE", "SC_OP_SUCCESS"): + "CARDCTRL", "BADMDC", "SC_OP_FAILURE", "SC_OP_SUCCESS", + "PINENTRY_LAUNCHED"): # in the case of ERROR, this is because a more specific error # message will have come first pass @@ -557,7 +558,8 @@ return self.fingerprint or '' def handle_status(self, key, value): - if key in ("PROGRESS", "GOOD_PASSPHRASE", "NODATA", "KEY_NOT_CREATED"): + if key in ("PROGRESS", "GOOD_PASSPHRASE", "NODATA", "KEY_NOT_CREATED", + "PINENTRY_LAUNCHED"): pass elif key == "KEY_CREATED": (self.type,self.fingerprint) = value.split() @@ -1202,10 +1204,8 @@ parms.setdefault('Key-Type','RSA') parms.setdefault('Key-Length',2048) parms.setdefault('Name-Real', "Autogenerated Key") - try: - logname = os.environ['LOGNAME'] - except KeyError: - logname = os.environ['USERNAME'] + logname = (os.environ.get('LOGNAME') or os.environ.get('USERNAME') or + 'unspecified') hostname = socket.gethostname() parms.setdefault('Name-Email', "%s@%s" % (logname.replace(' ', '_'), hostname))

1 0

gajim: update control.contact when we get a message from another...
by Gajim 17 May '15

17 May '15

changeset a6560ca0a485 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=a6560ca0a485 description: update control.contact when we get a message from another resource. Fixes #7919 diffstat: src/session.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diffs (29 lines): diff -r 98d3fa740273 -r a6560ca0a485 src/session.py --- a/src/session.py Tue May 12 09:41:58 2015 +0200 +++ b/src/session.py Sun May 17 15:40:42 2015 +0200 @@ -65,10 +65,14 @@ """ if obj.session != self: return + contact = gajim.contacts.get_contact(self.conn.name, obj.jid, + obj.resource) if self.resource != obj.resource: self.resource = obj.resource - if self.control and self.control.resource: - self.control.change_resource(self.resource) + if self.control: + self.control.contact = contact + if self.control.resource: + self.control.change_resource(self.resource) if obj.mtype == 'chat': if not obj.stanza.getTag('body') and obj.chatstate is None: @@ -114,8 +118,6 @@ obj.mtype = 'pm' # Handle chat states - contact = gajim.contacts.get_contact(self.conn.name, obj.jid, - obj.resource) if contact and (not obj.forwarded or not obj.sent): if self.control and self.control.type_id == \ message_control.TYPE_CHAT:

1 0

gajim: correctly invite contacts when converting chat to groupch...
by Gajim 12 May '15

12 May '15

changeset 98d3fa740273 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=98d3fa740273 description: correctly invite contacts when converting chat to groupchat. Fixes #8028 diffstat: src/groupchat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 593282487ba4 -r 98d3fa740273 src/groupchat_control.py --- a/src/groupchat_control.py Sun May 10 20:56:41 2015 +0200 +++ b/src/groupchat_control.py Tue May 12 09:41:58 2015 +0200 @@ -1619,7 +1619,7 @@ # sent by all servers. gajim.connections[self.account].request_gc_config( self.room_jid) - elif 'continue_tag' not in gajim.automatic_rooms[ + elif 'continue_tag' in gajim.automatic_rooms[ self.account][self.room_jid]: # We just need to invite contacts for jid in gajim.automatic_rooms[self.account][

1 0

gajim: stop sending chatstates when we get an error message from...
by Gajim 10 May '15

10 May '15

changeset 593282487ba4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=593282487ba4 description: stop sending chatstates when we get an error message from a contact. Fixes #8010 diffstat: src/chat_control.py | 2 ++ src/gui_interface.py | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diffs (23 lines): diff -r b6baa323cad3 -r 593282487ba4 src/chat_control.py --- a/src/chat_control.py Sun May 10 20:54:26 2015 +0200 +++ b/src/chat_control.py Sun May 10 20:56:41 2015 +0200 @@ -2712,6 +2712,8 @@ if not contact.supports(NS_CHATSTATES): return + if contact.our_chatstate == False: + return # if the new state we wanna send (state) equals # the current state (contact.our_chatstate) then return diff -r b6baa323cad3 -r 593282487ba4 src/gui_interface.py --- a/src/gui_interface.py Sun May 10 20:54:26 2015 +0200 +++ b/src/gui_interface.py Sun May 10 20:56:41 2015 +0200 @@ -415,6 +415,7 @@ account=account, name=nick, show=show) ctrl = self.new_private_chat(gc_c, account, session) + ctrl.contact.our_chatstate = False ctrl.print_conversation(_('Error %(code)s: %(msg)s') % { 'code': obj.error_code, 'msg': obj.error_msg}, 'status') return

1 0

gajim: some cleanup
by Gajim 10 May '15

10 May '15

changeset b6baa323cad3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=b6baa323cad3 description: some cleanup diffstat: src/common/zeroconf/connection_handlers_zeroconf.py | 3 --- src/common/zeroconf/connection_zeroconf.py | 1 + 2 files changed, 1 insertions(+), 3 deletions(-) diffs (24 lines): diff -r 4916254b34b7 -r b6baa323cad3 src/common/zeroconf/connection_handlers_zeroconf.py --- a/src/common/zeroconf/connection_handlers_zeroconf.py Mon Apr 06 19:14:33 2015 +0200 +++ b/src/common/zeroconf/connection_handlers_zeroconf.py Sun May 10 20:54:26 2015 +0200 @@ -24,9 +24,6 @@ ## import time -import socket - -from calendar import timegm import nbxmpp diff -r 4916254b34b7 -r b6baa323cad3 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Mon Apr 06 19:14:33 2015 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Sun May 10 20:54:26 2015 +0200 @@ -32,6 +32,7 @@ import os +import socket import random random.seed()

1 0

python-nbxmpp: roster set query element must contain only one it...
by Python-nbxmpp 10 May '15

10 May '15

changeset 398e3c8055a3 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=398e3c8055a3 description: roster set query element must contain only one item element. diffstat: nbxmpp/roster_nb.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (23 lines): diff -r 25f8a6d152cc -r 398e3c8055a3 nbxmpp/roster_nb.py --- a/nbxmpp/roster_nb.py Tue Mar 10 18:12:16 2015 +0100 +++ b/nbxmpp/roster_nb.py Sun May 10 14:54:16 2015 +0200 @@ -242,16 +242,16 @@ """ Rename multiple contacts and sets their group lists """ - iq = Iq('set', NS_ROSTER) - query = iq.getTag('query') for i in items: + iq = Iq('set', NS_ROSTER) + query = iq.getTag('query') attrs = {'jid': i['jid']} if i['name']: attrs['name'] = i['name'] item = query.setTag('item', attrs) for group in i['groups']: item.addChild(node=Node('group', payload=[group])) - self._owner.send(iq) + self._owner.send(iq) def getItems(self): """

1 0

gajim: link-local: track multiple service resolved infos (curren...
by Gajim 09 May '15

09 May '15

changeset f9dbf7888107 in /home/hg/repos/gajim author: Fabian Pietsch <fabian(a)canvon.de> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f9dbf7888107 description: link-local: track multiple service resolved infos (currently one for each browsing protocol) diffstat: src/common/zeroconf/roster_zeroconf.py | 5 ++- src/common/zeroconf/zeroconf.py | 4 +- src/common/zeroconf/zeroconf_avahi.py | 50 +++++++++++++++++++++++++++------ 3 files changed, 46 insertions(+), 13 deletions(-) diffs (123 lines): diff -r 3bce5506df4c -r f9dbf7888107 src/common/zeroconf/roster_zeroconf.py --- a/src/common/zeroconf/roster_zeroconf.py Wed May 06 22:05:42 2015 +0200 +++ b/src/common/zeroconf/roster_zeroconf.py Sun Apr 05 02:25:10 2015 +0200 @@ -59,8 +59,9 @@ if not contact: return - host, address, port = contact[4:7] - txt = contact[8] + resolved_info = contact[zeroconf.C_RESOLVED_INFO] + host, aprotocol, address, port = resolved_info[0][zeroconf.C_RI_HOST:zeroconf.C_RI_PORT+1] + txt = contact[zeroconf.C_TXT] self._data[jid]={} self._data[jid]['ask'] = 'none' diff -r 3bce5506df4c -r f9dbf7888107 src/common/zeroconf/zeroconf.py --- a/src/common/zeroconf/zeroconf.py Wed May 06 22:05:42 2015 +0200 +++ b/src/common/zeroconf/zeroconf.py Sun Apr 05 02:25:10 2015 +0200 @@ -17,8 +17,8 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -C_NAME, C_DOMAIN, C_INTERFACE, C_PROTOCOL, C_HOST, \ -C_ADDRESS, C_PORT, C_BARE_NAME, C_TXT = range(9) +C_NAME, C_DOMAIN, C_RESOLVED_INFO, C_BARE_NAME, C_TXT = range(5) +C_RI_INTERFACE, C_RI_PROTOCOL, C_RI_HOST, C_RI_APROTOCOL, C_RI_ADDRESS, C_RI_PORT = range(6) def test_avahi(): try: diff -r 3bce5506df4c -r f9dbf7888107 src/common/zeroconf/zeroconf_avahi.py --- a/src/common/zeroconf/zeroconf_avahi.py Wed May 06 22:05:42 2015 +0200 +++ b/src/common/zeroconf/zeroconf_avahi.py Sun Apr 05 02:25:10 2015 +0200 @@ -25,7 +25,8 @@ except ImportError, e: pass -from common.zeroconf.zeroconf import C_BARE_NAME, C_INTERFACE, C_PROTOCOL, C_DOMAIN +from common.zeroconf.zeroconf import C_BARE_NAME, C_RESOLVED_INFO, \ +C_RI_INTERFACE, C_RI_PROTOCOL, C_RI_APROTOCOL, C_DOMAIN, C_TXT class Zeroconf: def __init__(self, new_serviceCB, remove_serviceCB, name_conflictCB, @@ -93,7 +94,16 @@ return if name != self.name: for key in self.contacts.keys(): - if self.contacts[key][C_BARE_NAME] == name: + val = self.contacts[key] + if val[C_BARE_NAME] == name: + # try to reduce instead of delete first + resolved_info = val[C_RESOLVED_INFO] + if len(resolved_info) > 1: + for i in range(len(resolved_info)): + if resolved_info[i][C_RI_INTERFACE] == interface and resolved_info[i][C_RI_PROTOCOL] == protocol: + del self.contacts[key][C_RESOLVED_INFO][i] + # if still something left, don't remove + if len(self.contacts[key][C_RESOLVED_INFO]) > 1: return del self.contacts[key] self.remove_serviceCB(key) return @@ -151,16 +161,34 @@ # we don't want to see ourselves in the list if name != self.name: - self.contacts[name] = (name, domain, interface, protocol, host, - address, port, bare_name, txt) + resolved_info = [(interface, protocol, host, aprotocol, address, port)] + if name in self.contacts: + # Decide whether to try to merge with existing resolved info: + old_name, old_domain, old_resolved_info, old_bare_name, old_txt = self.contacts[name] + if name == old_name and domain == old_domain and bare_name == old_bare_name: + # Seems similar enough, try to merge resolved info: + for i in range(len(old_resolved_info)): + # for now, keep a single record for each (interface, protocol) pair + # + # Note that, theoretically, we could both get IPv4 and + # IPv6 aprotocol responses via the same protocol, + # so this probably needs to be revised again. + if old_resolved_info[i][0:2] == (interface, protocol): + log.debug('Deleting resolved info for interface %i, protocol %i, host %s, aprotocol %i, address %s, port %i' % old_resolved_info[i]) + del cur_hosts[i] + break + resolved_info = resolved_info + old_resolved_info + log.debug('Collected resolved info is now: %s' % (resolved_info,)) + self.contacts[name] = (name, domain, resolved_info, bare_name, txt) self.new_serviceCB(name) else: # remember data # In case this is not our own record but of another # gajim instance on the same machine, # it will be used when we get a new name. - self.invalid_self_contact[name] = (name, domain, interface, protocol, - host, address, port, bare_name, txt) + self.invalid_self_contact[name] = (name, domain, + (interface, protocol, host, aprotocol, address, port), + bare_name, txt) # different handler when resolving all contacts @@ -171,8 +199,9 @@ bare_name = name if name.find('@') == -1: name = name + '@' + name - self.contacts[name] = (name, domain, interface, protocol, host, address, - port, bare_name, txt) + # update TXT data only, as intended according to resolve_all comment + old_contact = self.contacts[name] + self.contacts[name] = old_contact[0:C_TXT] + (txt,) + old_contact[C_TXT+1:] def service_added_callback(self): log.debug('Service successfully added') @@ -426,7 +455,10 @@ if not self.connected: return for val in self.contacts.values(): - self.server.ResolveService(int(val[C_INTERFACE]), int(val[C_PROTOCOL]), + # get txt data from last recorded resolved info + # TODO: Better try to get it from last IPv6 mDNS, then last IPv4? + ri = val[C_RESOLVED_INFO][0] + self.server.ResolveService(int(ri[C_RI_INTERFACE]), int(ri[C_RI_PROTOCOL]), val[C_BARE_NAME], self.stype, val[C_DOMAIN], self.avahi.PROTO_UNSPEC, dbus.UInt32(0), reply_handler=self.service_resolved_all_callback,

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2015