Commits September 2012

commits@gajim.org

3 participants
33 discussions

gajim: [Darlan]. Update Hebrew translation.
by Fomin Denis 20 Sep '12

20 Sep '12

changeset 9c8c9cdad426 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9c8c9cdad426 description: [Darlan]. Update Hebrew translation. diffstat: po/he.po | 869 ++++++++++++++++++++++++++++++-------------------------------- 1 files changed, 425 insertions(+), 444 deletions(-) diffs (truncated from 2118 to 300 lines): diff -r 4d684f50be00 -r 9c8c9cdad426 po/he.po --- a/po/he.po Wed Sep 19 17:20:45 2012 +0200 +++ b/po/he.po Thu Sep 20 21:50:05 2012 +0400 @@ -8,7 +8,7 @@ "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-11 13:47+0200\n" +"PO-Revision-Date: 2012-09-17 15:20+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -274,7 +274,7 @@ #: ../src/notify.py:389 #: ../src/notify.py:405 msgid "Gajim" -msgstr "Gajim" +msgstr "‫Gajim" # BUG: _underline # אישי־קשר @@ -300,7 +300,7 @@ msgid "Administration operations" msgstr "פעולות הנהלת מערכת" -# BUG: from a jabber +# BUG: from a jabber "the" # שני לקוחות ומעלה #: ../data/gui/accounts_window.ui.h:15 msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events" @@ -369,7 +369,7 @@ # כוללני #: ../data/gui/accounts_window.ui.h:33 msgid "Synch_ronize account status with global status" -msgstr "סנכרון מצב חשבון עם מצב־החיבור ה_גלובלי" +msgstr "סנכרון מצב חשבון עם מצב־חיבור _גלובלי" # BUG: a dot at the end # תיבת אפשרויות @@ -379,7 +379,7 @@ # תיבת שיח #: ../data/gui/accounts_window.ui.h:34 msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly" -msgstr "במידה ואפשרות זו מסומנת, כל שינוי למצב־החיבור הגלובלי (מטופל על ידי תיבת־הבחירה שמצויה בתחתית חלון הרשימה) ישנה את המצב של חשבון זה בהתאמה" +msgstr "במידה ואפשרות זו מסומנת, כל שינוי אל מצב־החיבור הגלובלי (מטופל על ידי תיבת־הבחירה שמצויה בתחתית חלון הרשימה) ישנה את המצב של חשבון זה בהתאמה" # BUG: _underline #: ../data/gui/accounts_window.ui.h:35 @@ -511,7 +511,7 @@ #: ../data/gui/accounts_window.ui.h:60 msgid "Synchroni_ze account status with global status" -msgstr "סנכרון מצב חשבון עם מצב־החיבור ה_גלובלי" +msgstr "סנכרון מצב חשבון עם מצב־חיבור _גלובלי" #: ../data/gui/accounts_window.ui.h:61 msgid "Use cust_om port:" @@ -523,7 +523,7 @@ "If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n" "You might consider to change possible firewall settings." msgstr "" -"במידה והפתחה המשתמטת שמצויה בשימוש עבור הודעות נכנסות איננה מתאימה עבור ההתקנה שלך ביכולתך לבחור פתחה אחרת כאן.\n" +"במידה והפתחה המשתמטת שמצויה בשימוש עבור הודעות נכנסות איננה מתאימה עבור התקנתך ביכולתך לבחור פתחה אחרת כאן.\n" "ייתכן שיהיה ברצונך לשקול לשנות הגדרות חומת־אש אפשריות." #: ../data/gui/accounts_window.ui.h:64 @@ -581,10 +581,9 @@ msgid "_Group:" msgstr "_קבוצה:" -# הענקת הרשאה #: ../data/gui/add_new_contact_window.ui.h:7 msgid "A_llow this contact to view my status" -msgstr "ה_רשה לאיש־קשר זה לראות את מצב־החיבור שלי" +msgstr "הת_ר לאיש־קשר זה לראות את מצב־חיבורי" # BUG: Request or Subscription Request instead of Subscription # בקשת @@ -609,14 +608,13 @@ msgid "_Register" msgstr "ה_רשמה" -# היכולת #: ../data/gui/add_new_contact_window.ui.h:14 msgid "" "You must be connected to the transport to be able\n" "to add a contact from this protocol." msgstr "" "עליך להתחבר אל מוביל בכדי שתעמוד לרשותך\n" -"האפשרות להוסיף איש־קשר מפרוטוקול זה ." +"היכולת להוסיף איש־קשר מן פרוטוקול זה." #: ../data/gui/add_new_contact_window.ui.h:16 #: ../src/common/helpers.py:1363 @@ -1115,7 +1113,7 @@ # לאיש־קשר זה #: ../data/gui/contact_context_menu.ui.h:17 msgid "_Allow him/her to see my status" -msgstr "_התר לאיש־קשר זה לראות את מצב־החיבור שלי" +msgstr "_התר לאיש־קשר זה לראות את מצב־חיבורי" # לראות # שלה/שלו @@ -1125,7 +1123,7 @@ #: ../data/gui/contact_context_menu.ui.h:19 msgid "_Forbid him/her to see my status" -msgstr "_מנע מאיש־קשר זה מלראות את מצב־החיבור שלי" +msgstr "_מנע מאיש־קשר זה מלראות את מצב־חיבורי" #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_occupants_menu.ui.h:13 @@ -1276,7 +1274,7 @@ #: ../data/gui/gajim_themes_window.ui.h:5 msgid "Gajim Themes Customization" -msgstr "התאמת מוטיבים של Gajim" +msgstr "התאמת מוטיבים של ‫Gajim" #: ../data/gui/gajim_themes_window.ui.h:6 msgid "Text _color:" @@ -1427,7 +1425,7 @@ #: ../data/gui/groupchat_control.ui.h:3 msgid "Change your nickname (Ctrl+N)" -msgstr "שינוי הכינוי שלך (Ctrl+N)" +msgstr "שינוי כינוייך (Ctrl+N)" #: ../data/gui/groupchat_control.ui.h:4 msgid "Change the room's subject (Alt+T)" @@ -1454,7 +1452,7 @@ #: ../data/gui/history_manager.ui.h:1 msgid "Gajim History Logs Manager" -msgstr "מנהל רשומות ההיסטוריה של Gajim" +msgstr "מנהל רשומות ההיסטוריה של ‫Gajim" #: ../data/gui/history_manager.ui.h:2 msgid "<big>Welcome to Gajim History Logs Manager</big>" @@ -1478,7 +1476,7 @@ "If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with." msgstr "" "אזהרה:\n" -"אם בכוונתך לבצע מחיקה בקנה מידה גדול, נא לוודא שהיישום Gajim אינו מורץ. באופן כללי מוטב להימנע ממחיקות עם אנשי־קשר שמשוחחים עימך כעת." +"אם בכוונתך לבצע מחיקה בקנה מידה גדול, נא לוודא שהיישום Gajim אינו מורץ. באופן כללי מוטב להימנע ממחיקות עם אנשי־קשר שמשוחחים עמך כעת." #: ../data/gui/history_manager.ui.h:8 msgid "_Search Database" @@ -1782,11 +1780,11 @@ #: ../data/gui/plugins_window.ui.h:7 msgid "Homepage:" -msgstr "עמוד-בית:" +msgstr "עמוד בית:" #: ../data/gui/plugins_window.ui.h:8 msgid "homepage url" -msgstr "כתובת עמוד-בית" +msgstr "כתובת עמוד בית" #: ../data/gui/plugins_window.ui.h:9 msgid "Description:" @@ -1930,7 +1928,7 @@ # שברשימה #: ../data/gui/preferences_window.ui.h:25 msgid "Display _activity of contacts in roster" -msgstr "הצגת ה_פעילויות של אנשי־קשר ברשימה" +msgstr "הצגת _פעילויות של אנשי־קשר ברשימה" # BUG: a dot at the end #: ../data/gui/preferences_window.ui.h:26 @@ -1950,7 +1948,7 @@ # Changed "location" with "locations" #: ../data/gui/preferences_window.ui.h:29 msgid "Display _location of contacts in roster" -msgstr "הצגת ה_מיקומים של אנשי־קשר ברשימה" +msgstr "הצגת _מיקומים של אנשי־קשר ברשימה" # BUG: a dot at the end #: ../data/gui/preferences_window.ui.h:30 @@ -1978,15 +1976,14 @@ msgid "_Window behavior:" msgstr "התנהגות _חלונות:" -# נייחים +# תרשימיים, נייחים #: ../data/gui/preferences_window.ui.h:36 msgid "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent animated or static graphical emoticons" msgstr "במידה ואפשרות זו לא מנוטרלת, Gajim יחליף סמיילים המורכבים מתווי ascii כגון ':)' עם רגשונים ציוריים תואמים (מונפשים או סטטיים)" -# Emoticons theme #: ../data/gui/preferences_window.ui.h:37 msgid "_Emoticons:" -msgstr "מוטיב _רגשונים:" +msgstr "_רגשונים:" # דחוסים, מקוצרים #: ../data/gui/preferences_window.ui.h:38 @@ -2001,7 +1998,7 @@ # עם תבנית טקסט עשירה #: ../data/gui/preferences_window.ui.h:40 msgid "_Ignore rich content in incoming messages" -msgstr "הת_עלמות מתוכן עשיר בהודעות נכנסות" +msgstr "הת_עלמות מן תוכן עשיר בהודעות נכנסות" # הודעות מסוימות עשויות להכיל #: ../data/gui/preferences_window.ui.h:41 @@ -2257,10 +2254,9 @@ msgid "Contact's nickname:" msgstr "כינוי איש־הקשר:" -# כינוייך #: ../data/gui/preferences_window.ui.h:99 msgid "Your nickname:" -msgstr "הכינוי שלך:" +msgstr "כינוייך:" #: ../data/gui/preferences_window.ui.h:100 msgid "_Status message:" @@ -2280,10 +2276,9 @@ msgid "Contact's message:" msgstr "הודעת איש־הקשר:" -# הודעתך #: ../data/gui/preferences_window.ui.h:104 msgid "Your message:" -msgstr "ההודעה שלך:" +msgstr "הודעתך:" #: ../data/gui/preferences_window.ui.h:105 msgid "Chat Line Colors" @@ -2371,7 +2366,6 @@ msgid "Applications" msgstr "יישומים" -# מן #: ../data/gui/preferences_window.ui.h:127 msgid "_Ignore events from contacts not in the roster" msgstr "הת_עלמות מן אירועים מאת אנשי־קשר שלא נוכחים ברשימה" @@ -2509,7 +2503,7 @@ #: ../data/gui/privacy_list_window.ui.h:15 msgid "to view my status" -msgstr "לצפות במצב־החיבור שלי" +msgstr "לצפות במצב־חיבורי" # מצבי־חיבור # מצבים @@ -2724,7 +2718,7 @@ #: ../data/gui/roster_item_exchange_window.ui.h:2 msgid "someone(a)somewhere.com would like you to add some contacts in your roster." -msgstr "מישהו(a)xn--4dbido9c4a.xn--9dbq2a מעוניין להוסיף כמה אנשי־קשר חדשים אל הרשימה שלך." +msgstr "מישהו(a)xn--4dbido9c4a.xn--9dbq2a מעוניין להוסיף כמה אנשי־קשר חדשים אל רשימתך." #: ../data/gui/roster_item_exchange_window.ui.h:3 #: ../data/gui/service_registration_window.ui.h:3 @@ -2908,7 +2902,7 @@ # שאיתו #: ../data/gui/synchronise_select_account_dialog.ui.h:2 msgid "Select the account with which you want to synchronise" -msgstr "בחירת החשבון שעימו ברצונך להסתנכרן" +msgstr "בחירת החשבון שעמו ברצונך להסתנכרן" #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1 msgid "Synchronise : select contacts" @@ -3086,7 +3080,7 @@ #: ../data/gajim.desktop.in.in.h:3 msgid "A GTK+ Jabber client" -msgstr "לקוח ג'אבּר ‭GTK+‬" +msgstr "לקוח ג׳אבּר ‭GTK+‬" #: ../src/adhoc_commands.py:323 msgid "Cancel confirmation" @@ -3326,7 +3320,7 @@ msgid "Font" msgstr "גופן" -# ניקוי, כיבוי +# טיהור, ניקוי, כיבוי # Reset #: ../src/chat_control.py:1084 msgid "Clear formating" @@ -3337,10 +3331,11 @@ msgstr "האם באמת לשלוח קובץ?" # Real>Full +# איש־הקשר ידע/תדע #: ../src/chat_control.py:1162 #, python-format msgid "If you send a file to %s, he/she will know your real Jabber ID." -msgstr "אם תשלח קובץ אל %s, הוא/היא ידעו את כתובתך (JID) המלאה." +msgstr "אם תשלח/י קובץ אל %s, הוא/היא ידעו את כתובתך (JID) המלאה." # Changed enabled with activated # Enabled = מאופשרת @@ -3552,11 +3547,11 @@ "לא ניתן לפענח את ההודעה מאת %s\n" "ייתכן שההודעה נפגמה."

1 0

gajim: handle disconnection while doing SASL as a sasl failure r...
by Yann Leboulanger 19 Sep '12

19 Sep '12

changeset 4d684f50be00 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4d684f50be00 description: handle disconnection while doing SASL as a sasl failure rather than a connection error. Fixes #3343 diffstat: src/common/xmpp/client_nb.py | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diffs (45 lines): diff -r 6489982941d0 -r 4d684f50be00 src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Wed Sep 19 09:49:43 2012 +0200 +++ b/src/common/xmpp/client_nb.py Wed Sep 19 17:20:45 2012 +0200 @@ -85,6 +85,7 @@ log.info('Disconnecting NBClient: %s' % message) + sasl_failed = False if 'NonBlockingRoster' in self.__dict__: self.NonBlockingRoster.PlugOut() if 'NonBlockingBind' in self.__dict__: @@ -92,7 +93,12 @@ if 'NonBlockingNonSASL' in self.__dict__: self.NonBlockingNonSASL.PlugOut() if 'SASL' in self.__dict__: - self.SASL.PlugOut() + if self.SASL.startsasl == 'failure-in-process': + sasl_failed = True + self.SASL.startsasl = 'failure' + self._on_start_sasl() + else: + self.SASL.PlugOut() if 'NonBlockingTCP' in self.__dict__: self.NonBlockingTCP.PlugOut() if 'NonBlockingHTTP' in self.__dict__: @@ -111,7 +117,9 @@ self.disconnecting = True log.debug('Client disconnected..') - if connected == '': + # Don't call any callback when it's a SASL failure. + # SASL handler is already called + if connected == '' and not sasl_failed: # if we're disconnecting before connection to XMPP sever is opened, # we don't call disconnect handlers but on_connect_failure callback if self.proxy: @@ -121,7 +129,7 @@ else: log.debug('calling on_connect_failure cb') self.on_connect_failure() - else: + elif not sasl_failed: # we are connected to XMPP server if not stream_started: # if error occur before XML stream was opened, e.g. no response on

1 0

gajim: fix function argument. Fixes #7229
by Yann Leboulanger 19 Sep '12

19 Sep '12

changeset 6489982941d0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6489982941d0 description: fix function argument. Fixes #7229 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7c480fc0c0e6 -r 6489982941d0 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Sep 18 17:24:51 2012 +0200 +++ b/src/common/connection_handlers.py Wed Sep 19 09:49:43 2012 +0200 @@ -968,7 +968,7 @@ if sess.enable_encryption: sess.terminate_e2e() - def decrypt_thread(encmsg, keyID, obj): + def decrypt_thread(self, encmsg, keyID, obj): decmsg = self.gpg.decrypt(encmsg, keyID) decmsg = self.connection.Dispatcher.replace_non_character(decmsg) # \x00 chars are not allowed in C (so in GTK)

1 0

gajim: print punycode encoded urls if they contain non-ascii cha...
by Yann Leboulanger 18 Sep '12

18 Sep '12

changeset 7c480fc0c0e6 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7c480fc0c0e6 description: print punycode encoded urls if they contain non-ascii chars. Fixes #7204 diffstat: src/conversation_textview.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diffs (24 lines): diff -r fa849f1418f1 -r 7c480fc0c0e6 src/conversation_textview.py --- a/src/conversation_textview.py Tue Sep 18 16:07:11 2012 +0200 +++ b/src/conversation_textview.py Tue Sep 18 17:24:51 2012 +0200 @@ -49,7 +49,7 @@ from htmltextview import HtmlTextView from common.exceptions import GajimGeneralException -from common.exceptions import LatexError +from encodings.punycode import punycode_encode as puny_encode NOT_SHOWN = 0 ALREADY_RECEIVED = 1 @@ -1165,6 +1165,11 @@ # convert all names to TextTag all_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in all_tags] buffer_.insert_with_tags(end_iter, special_text, *all_tags) + if 'url' in tags: + puny_text = puny_encode(special_text) + if not puny_text.endswith('-'): + end_iter = buffer_.get_end_iter() + buffer_.insert(end_iter, " (%s)" % puny_text) def print_empty_line(self): buffer_ = self.tv.get_buffer()

1 0

gajim: decrypt GPG messages one after the other. Fixes #7229
by Yann Leboulanger 18 Sep '12

18 Sep '12

changeset fa849f1418f1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fa849f1418f1 description: decrypt GPG messages one after the other. Fixes #7229 diffstat: src/common/connection_handlers.py | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diffs (57 lines): diff -r bb3e5a5d706e -r fa849f1418f1 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Sep 18 15:16:11 2012 +0200 +++ b/src/common/connection_handlers.py Tue Sep 18 16:07:11 2012 +0200 @@ -767,6 +767,9 @@ # keep track of sessions this connection has with other JIDs self.sessions = {} + # We decrypt GPG messages one after the other. Keep queue in mem + self.gpg_messages_to_decrypt = [] + gajim.ged.register_event_handler('iq-error-received', ged.CORE, self._nec_iq_error_received) gajim.ged.register_event_handler('presence-received', ged.CORE, @@ -965,6 +968,14 @@ if sess.enable_encryption: sess.terminate_e2e() + def decrypt_thread(encmsg, keyID, obj): + decmsg = self.gpg.decrypt(encmsg, keyID) + decmsg = self.connection.Dispatcher.replace_non_character(decmsg) + # \x00 chars are not allowed in C (so in GTK) + obj.msgtxt = helpers.decode_string(decmsg.replace('\x00', '')) + obj.encrypted = 'xep27' + self.gpg_messages_to_decrypt.remove([encmsg, keyID, obj]) + def _nec_message_received(self, obj): if obj.conn.name != self.name: return @@ -982,20 +993,18 @@ keyID = gajim.config.get_per('accounts', self.name, 'keyid') if keyID: - def decrypt_thread(encmsg, keyID, obj): - decmsg = self.gpg.decrypt(encmsg, keyID) - decmsg = self.connection.Dispatcher.replace_non_character( - decmsg) - # \x00 chars are not allowed in C (so in GTK) - obj.msgtxt = helpers.decode_string(decmsg.replace('\x00', - '')) - obj.encrypted = 'xep27' - gajim.thread_interface(decrypt_thread, [encmsg, keyID, obj], - self._on_message_decrypted, [obj]) + self.gpg_messages_to_decrypt.append([encmsg, keyID, obj]) + if len(self.gpg_messages_to_decrypt) == 1: + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, + obj], self._on_message_decrypted, [obj]) return self._on_message_decrypted(None, obj) def _on_message_decrypted(self, output, obj): + if len(self.gpg_messages_to_decrypt): + encmsg, keyID, obj = self.gpg_messages_to_decrypt[0] + gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj], + self._on_message_decrypted, [obj]) gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, conn=self, msg_obj=obj))

1 0

gajim: don't clear selection buffer when enabling roster filteri...
by Yann Leboulanger 18 Sep '12

18 Sep '12

changeset bb3e5a5d706e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bb3e5a5d706e description: don't clear selection buffer when enabling roster filtering. Fixes #7233 diffstat: src/roster_window.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (23 lines): diff -r be797294d452 -r bb3e5a5d706e src/roster_window.py --- a/src/roster_window.py Tue Sep 18 00:13:31 2012 -0400 +++ b/src/roster_window.py Tue Sep 18 15:16:11 2012 +0200 @@ -4442,6 +4442,9 @@ self.disable_rfilter() def enable_rfilter(self, search_string): + self.rfilter_entry.set_visible(True) + self.rfilter_entry.set_editable(True) + self.rfilter_entry.grab_focus() if self.rfilter_enabled: self.rfilter_entry.set_text(self.rfilter_entry.get_text() + \ search_string) @@ -4449,9 +4452,6 @@ self.rfilter_enabled = True self.rfilter_entry.set_text(search_string) self.tree.expand_all() - self.rfilter_entry.set_visible(True) - self.rfilter_entry.set_editable(True) - self.rfilter_entry.grab_focus() self.rfilter_entry.set_position(-1) def disable_rfilter(self):

1 0

gajim: commenting DEBUG code
by Jefry Lagrange 18 Sep '12

18 Sep '12

changeset be797294d452 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=be797294d452 description: commenting DEBUG code diffstat: src/common/jingle.py | 4 ++-- src/common/jingle_ft.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (26 lines): diff -r 739f86c4c606 -r be797294d452 src/common/jingle.py --- a/src/common/jingle.py Tue Sep 18 00:12:07 2012 -0400 +++ b/src/common/jingle.py Tue Sep 18 00:13:31 2012 -0400 @@ -197,8 +197,8 @@ def get_files_info(self, hash_=None, name=None): if hash_: for f in self.files: # DEBUG - if f['hash'] == '1294809248109223': - #if f['hash'] == hash_: + #if f['hash'] == '1294809248109223': + if f['hash'] == hash_: return f elif name: for f in self.files: diff -r 739f86c4c606 -r be797294d452 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Tue Sep 18 00:12:07 2012 -0400 +++ b/src/common/jingle_ft.py Tue Sep 18 00:13:31 2012 -0400 @@ -155,7 +155,7 @@ h = xmpp.Hashes() hash_ = h.calculateHash(self.file_props.algo, file_) # DEBUG - hash_ = '1294809248109223' + #hash_ = '1294809248109223' if not hash_: # Hash alogrithm not supported return

1 0

gajim: refactoring
by Jefry Lagrange 18 Sep '12

18 Sep '12

changeset 739f86c4c606 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=739f86c4c606 description: refactoring diffstat: src/common/jingle.py | 4 ++-- src/common/jingle_ft.py | 2 +- src/common/jingle_ftstates.py | 38 +++++++++++++++++--------------------- src/common/socks5.py | 25 +++++++++++-------------- 4 files changed, 31 insertions(+), 38 deletions(-) diffs (223 lines): diff -r 1303dd690373 -r 739f86c4c606 src/common/jingle.py --- a/src/common/jingle.py Mon Sep 17 11:53:47 2012 +0200 +++ b/src/common/jingle.py Tue Sep 18 00:12:07 2012 -0400 @@ -197,8 +197,8 @@ def get_files_info(self, hash_=None, name=None): if hash_: for f in self.files: # DEBUG - #if f['hash'] == '1294809248109223': - if f['hash'] == hash_: + if f['hash'] == '1294809248109223': + #if f['hash'] == hash_: return f elif name: for f in self.files: diff -r 1303dd690373 -r 739f86c4c606 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Sep 17 11:53:47 2012 +0200 +++ b/src/common/jingle_ft.py Tue Sep 18 00:12:07 2012 -0400 @@ -155,7 +155,7 @@ h = xmpp.Hashes() hash_ = h.calculateHash(self.file_props.algo, file_) # DEBUG - #hash_ = '1294809248109223' + hash_ = '1294809248109223' if not hash_: # Hash alogrithm not supported return diff -r 1303dd690373 -r 739f86c4c606 src/common/jingle_ftstates.py --- a/src/common/jingle_ftstates.py Mon Sep 17 11:53:47 2012 +0200 +++ b/src/common/jingle_ftstates.py Tue Sep 18 00:12:07 2012 -0400 @@ -153,37 +153,34 @@ streamhost_used = self.jft.nominated_cand['peer-cand'] if streamhost_used['type'] == 'proxy': self.jft.file_props.is_a_proxy = True - # This needs to be changed when requesting - if self.jft.weinitiate: + if self.jft.file_props.type_ == 's' and self.jft.weinitiate: self.jft.file_props.proxy_sender = streamhost_used['initiator'] self.jft.file_props.proxy_receiver = streamhost_used['target'] else: self.jft.file_props.proxy_sender = streamhost_used['target'] self.jft.file_props.proxy_receiver = streamhost_used[ 'initiator'] - # This needs to be changed when requesting - if not self.jft.weinitiate and streamhost_used['type'] == 'proxy': - r = gajim.socks5queue.readers - for reader in r: - if r[reader].host == streamhost_used['host'] and \ - r[reader].connected: - return - # This needs to be changed when requesting - if self.jft.weinitiate and streamhost_used['type'] == 'proxy': - s = gajim.socks5queue.senders - for sender in s: - if s[sender].host == streamhost_used['host'] and \ - s[sender].connected: - return - if streamhost_used['type'] == 'proxy': + if self.jft.file_props.type_ == 's': + s = gajim.socks5queue.senders + for sender in s: + if s[sender].host == streamhost_used['host'] and \ + s[sender].connected: + return + elif self.jft.file_props.type_ == 'r': + r = gajim.socks5queue.readers + for reader in r: + if r[reader].host == streamhost_used['host'] and \ + r[reader].connected: + return + else: + raise TypeError self.jft.file_props.streamhost_used = True streamhost_used['sid'] = self.jft.file_props.sid self.jft.file_props.streamhosts = [] self.jft.file_props.streamhosts.append(streamhost_used) self.jft.file_props.proxyhosts = [] self.jft.file_props.proxyhosts.append(streamhost_used) - # This needs to be changed when requesting - if self.jft.weinitiate: + if self.jft.file_props.type_ == 's': gajim.socks5queue.idx += 1 idx = gajim.socks5queue.idx sockobj = Socks5SenderClient(gajim.idlequeue, idx, @@ -198,7 +195,7 @@ sockobj.proxy = True sockobj.streamhost = streamhost_used gajim.socks5queue.add_sockobj(self.jft.session.connection.name, - sockobj, 'sender') + sockobj) streamhost_used['idx'] = sockobj.queue_idx # If we offered the nominated candidate used, we activate # the proxy @@ -214,7 +211,6 @@ def action(self, args=None): if self.jft.transport.type_ == TransportType.IBB: self.__start_IBB_transfer(self.jft.session.connection) - elif self.jft.transport.type_ == TransportType.SOCKS5: self.__start_SOCK5_transfer() diff -r 1303dd690373 -r 739f86c4c606 src/common/socks5.py --- a/src/common/socks5.py Mon Sep 17 11:53:47 2012 +0200 +++ b/src/common/socks5.py Tue Sep 18 00:12:07 2012 -0400 @@ -83,7 +83,6 @@ authentication using sid for generated SHA """ sid = file_props.sid - self.type_ = typ # It says whether we are sending or receiving self.sha_handlers[sha_str] = (sha_handler, sid) if self.listener is None or self.listener.connections == []: self.listener = Socks5Listener(self.idlequeue, port, file_props, @@ -135,7 +134,7 @@ else: fp = fingerprint if receiving: - self.type_ = 'receiver' + file_props.type_ = 'r' socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, sid, file_props, fingerprint=fp) self.add_sockobj(account, socks5obj) @@ -145,7 +144,7 @@ else: idx = self.idx self.idx = self.idx + 1 - self.type_ = 'sender' + file_props.type_ = 's' if 'type' in streamhost and streamhost['type'] == 'proxy': file_props.is_a_proxy = True file_props.proxy_sender = streamhost['target'] @@ -155,7 +154,7 @@ port=int(streamhost['port']),fingerprint=fp, connected=False, file_props=file_props) socks5obj.streamhost = streamhost - self.add_sockobj(account, socks5obj, type_='sender') + self.add_sockobj(account, socks5obj) streamhost['idx'] = socks5obj.queue_idx @@ -168,7 +167,7 @@ if host != streamhost and 'idx' in host: if host['state'] == 1: # remove current - if self.type_ == 'sender': + if file_props.type_ == 's': self.remove_sender(streamhost['idx'], False) else: self.remove_receiver(streamhost['idx']) @@ -176,7 +175,7 @@ # set state -2, meaning that this streamhost is stopped, # but it may be connectected later if host['state'] >= 0: - if self.type_ == 'sender': + if file_props.type_ == 's': self.remove_sender(host['idx'], False) else: self.remove_receiver(host['idx']) @@ -239,12 +238,12 @@ file_props.failure_cb(file_props.sid) file_props.failure_cb = None - def add_sockobj(self, account, sockobj, type_='receiver'): + def add_sockobj(self, account, sockobj): """ Add new file a sockobj type receiver or sender, and use it to connect to server """ - if type_ == 'receiver': + if sockobj.file_props.type_ == 'r': self._add(sockobj, self.readers, sockobj.file_props, self.idx) else: self._add(sockobj, self.senders, sockobj.file_props, self.idx) @@ -327,7 +326,7 @@ def on_connection_accepted(self, sock, listener): sock_hash = sock.__hash__() - if self.type_ == 'sender' and \ + if listener.file_props.type_ == 's' and \ not self.isHashInSockObjs(self.senders, sock_hash): sockobj = Socks5SenderServer(self.idlequeue, sock_hash, self, sock[0], sock[1][0], sock[1][1], fingerprint='server', @@ -336,7 +335,7 @@ # Start waiting for data self.idlequeue.plug_idle(sockobj, False, True) self.connected += 1 - if self.type_ == 'receiver' and \ + if listener.file_props.type_ == 'r' and \ not self.isHashInSockObjs(self.readers, sock_hash): sh = {} sh['host'] = sock[1][0] @@ -441,7 +440,6 @@ self.remaining_buff = '' self.file = None self.connected = False - self.type_ = '' self.mode = '' def _is_connected(self): @@ -914,7 +912,6 @@ self.file_props.elapsed_time = 0 self.file_props.last_time = self.idlequeue.current_time() self.file_props.received_len = 0 - self.type_ = 'sender' def start_transfer(self): """ @@ -1076,7 +1073,7 @@ self.disconnect() elif self.state == 5: self.state = 7 - if self.type_ == 'sender': + if self.file_props.type_ == 's': # We wait for the end of the negotiation to # send the file self.idlequeue.plug_idle(self, False, False) @@ -1186,7 +1183,7 @@ if self.queue.on_success: result = self.queue.send_success_reply(self.file_props, self.streamhost) - if self.type_ == 'sender' and self.proxy: + if self.file_props.type_ == 's' and self.proxy: self.queue.process_result(self.send_file(), self) return if result == 0:

1 0

gajim: correctly check is zeroconf account is connected. see #7199
by Yann Leboulanger 17 Sep '12

17 Sep '12

changeset 1303dd690373 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1303dd690373 description: correctly check is zeroconf account is connected. see #7199 diffstat: src/statusicon.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ead9d19d0ee5 -r 1303dd690373 src/statusicon.py --- a/src/statusicon.py Sun Sep 16 20:54:07 2012 +0200 +++ b/src/statusicon.py Mon Sep 17 11:53:47 2012 +0200 @@ -256,7 +256,7 @@ item.connect('activate', self.on_show_menuitem_activate, 'offline') iskey = connected_accounts > 0 and not (connected_accounts == 1 and - gajim.connections[gajim.connections.keys()[0]].is_zeroconf) + gajim.zeroconf_is_connected()) chat_with_menuitem.set_sensitive(iskey) single_message_menuitem.set_sensitive(iskey) join_gc_menuitem.set_sensitive(iskey)

1 0

gajim: re-request file transfer to the correct resource
by Yann Leboulanger 16 Sep '12

16 Sep '12

changeset ead9d19d0ee5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ead9d19d0ee5 description: re-request file transfer to the correct resource diffstat: src/filetransfers_window.py | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diffs (36 lines): diff -r 9351f657ac8e -r ead9d19d0ee5 src/filetransfers_window.py --- a/src/filetransfers_window.py Sat Sep 15 10:39:35 2012 -0400 +++ b/src/filetransfers_window.py Sun Sep 16 20:54:07 2012 +0200 @@ -249,13 +249,17 @@ def show_hash_error(self, jid, file_props, account): - def on_yes(dummy): + def on_yes(dummy, fjid, file_props, account): # Delete old file os.remove(file_props.file_name) + jid, resource = gajim.get_room_and_nick_from_fjid(fjid) + if resource: + contact = gajim.contacts.get_contact(account, jid, resource) + else: + contact = gajim.contacts.get_contact_with_highest_priority( + account, jid) + fjid = contact.get_full_jid() # Request the file to the sender - contact = gajim.contacts.get_contact_with_highest_priority(account, - jid) - fjid = contact.get_full_jid() sid = helpers.get_random_string_16() new_file_props = FilesProp.getNewFileProp(account, sid) new_file_props.file_name = file_props.file_name @@ -278,8 +282,8 @@ dialogs.YesNoDialog(('File transfer error'), _('The file %(file)s has been fully received, but it seems to be ' 'wrongly received.\nDo you want to reload it?') % \ - {'file': file_name}, on_response_yes=on_yes, - type_=gtk.MESSAGE_ERROR) + {'file': file_name}, on_response_yes=(on_yes, jid, file_props, + account), type_=gtk.MESSAGE_ERROR) def show_file_send_request(self, account, contact): win = gtk.ScrolledWindow()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2012