Commits November 2012

commits@gajim.org

3 participants
21 discussions

python-nbxmpp: do TLS handshake without blocking.
by Yann Leboulanger 29 Nov '12

29 Nov '12

changeset b599a742986d in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=b599a742986d description: do TLS handshake without blocking. diffstat: nbxmpp/tls_nb.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (19 lines): diff -r b866926c8c53 -r b599a742986d nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Thu Nov 29 14:56:33 2012 +0100 +++ b/nbxmpp/tls_nb.py Thu Nov 29 14:58:25 2012 +0100 @@ -418,13 +418,13 @@ tcpsock._send = wrapper.send log.debug("Initiating handshake...") - tcpsock._sslObj.setblocking(True) try: tcpsock._sslObj.do_handshake() + except (OpenSSL.SSL.WantReadError, OpenSSL.SSL.WantWriteError), e: + pass except: log.error('Error while TLS handshake: ', exc_info=True) return False - tcpsock._sslObj.setblocking(False) self._owner.ssl_lib = PYOPENSSL return True

1 0

python-nbxmpp: handle disconnection while doing SASL as a sasl f...
by Yann Leboulanger 29 Nov '12

29 Nov '12

changeset b866926c8c53 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=b866926c8c53 description: handle disconnection while doing SASL as a sasl failure rather than a connection error. diffstat: nbxmpp/client_nb.py | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diffs (45 lines): diff -r 01d3262e1b92 -r b866926c8c53 nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Thu Nov 29 14:46:27 2012 +0100 +++ b/nbxmpp/client_nb.py Thu Nov 29 14:56:33 2012 +0100 @@ -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

python-nbxmpp: don't try to connect twice when we get see-other-...
by Yann Leboulanger 29 Nov '12

29 Nov '12

changeset 01d3262e1b92 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=01d3262e1b92 description: don't try to connect twice when we get see-other-host. diffstat: nbxmpp/client_nb.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r f53ac3706cd7 -r 01d3262e1b92 nbxmpp/client_nb.py --- a/nbxmpp/client_nb.py Tue Jun 19 19:26:06 2012 +0200 +++ b/nbxmpp/client_nb.py Thu Nov 29 14:46:27 2012 +0100 @@ -354,6 +354,7 @@ self.Dispatcher.ProcessNonBlocking(data) if self.got_see_other_host: log.info('got see-other-host') + self.onreceive(None) self.on_stream_error_cb(self, self.got_see_other_host) elif not self.got_features: self._xmpp_connect_machine(mode='FAILURE',

1 0

gajim: Resolve GtkWarning: IA__gtk_tree_view_expand_row: asserti...
by Jefry Lagrange 24 Nov '12

24 Nov '12

changeset c737c0690cec in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c737c0690cec description: Resolve GtkWarning: IA__gtk_tree_view_expand_row: assertion tree_view->priv->model != NULL diffstat: src/groupchat_control.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 83e56a7e2f5e -r c737c0690cec src/groupchat_control.py --- a/src/groupchat_control.py Fri Nov 23 21:38:36 2012 -0400 +++ b/src/groupchat_control.py Sat Nov 24 02:19:56 2012 -0400 @@ -1822,7 +1822,8 @@ fake_jid) if nick == self.nick: # we became online self.got_connected() - self.list_treeview.expand_row((self.model.get_path(role_iter)), False) + if self.list_treeview.get_model(): + self.list_treeview.expand_row((self.model.get_path(role_iter)), False) if self.is_continued: self.draw_banner_text() return iter_

1 0

gajim: prevent connection to be called when there is no connection
by Jefry Lagrange 24 Nov '12

24 Nov '12

changeset 83e56a7e2f5e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=83e56a7e2f5e description: prevent connection to be called when there is no connection diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b8a2f4925a43 -r 83e56a7e2f5e src/common/connection.py --- a/src/common/connection.py Fri Nov 23 11:44:03 2012 +0400 +++ b/src/common/connection.py Fri Nov 23 21:38:36 2012 -0400 @@ -1667,7 +1667,7 @@ self._stun_servers = self._hosts = [i for i in result_array] def _request_privacy(self): - if not gajim.account_is_connected(self.name): + if not gajim.account_is_connected(self.name) or not self.connection: return iq = common.xmpp.Iq('get', common.xmpp.NS_PRIVACY, xmlns = '') id_ = self.connection.getAnID()

1 0

gajim: ManageBookmarksWindow. Remove unused function
by Fomin Denis 23 Nov '12

23 Nov '12

changeset b8a2f4925a43 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b8a2f4925a43 description: ManageBookmarksWindow. Remove unused function diffstat: src/config.py | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diffs (23 lines): diff -r fba5f172650b -r b8a2f4925a43 src/config.py --- a/src/config.py Tue Nov 20 13:00:57 2012 +0400 +++ b/src/config.py Fri Nov 23 11:44:03 2012 +0400 @@ -3191,19 +3191,6 @@ # select root iter self.selection.select_iter(self.treestore.get_iter_root()) - def on_bookmarks_treeview_button_press_event(self, widget, event): - (model, iter_) = self.selection.get_selected() - if not iter_: - # Removed a bookmark before - return - - if model.iter_parent(iter_): - # The currently selected node is a bookmark - return not self.check_valid_bookmark() - - def on_manage_bookmarks_window_destroy(self, widget, event): - del gajim.interface.instances['manage_bookmarks'] - def on_add_bookmark_button_clicked(self, widget): """ Add a new bookmark

1 0

gajim: hide 'bookmark_ button' if private storage not supported....
by Fomin Denis 20 Nov '12

20 Nov '12

changeset fba5f172650b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fba5f172650b description: hide 'bookmark_ button' if private storage not supported.part 2 diffstat: src/groupchat_control.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diffs (30 lines): diff -r 39d2f5181210 -r fba5f172650b src/groupchat_control.py --- a/src/groupchat_control.py Tue Nov 20 11:29:13 2012 +0400 +++ b/src/groupchat_control.py Tue Nov 20 13:00:57 2012 +0400 @@ -328,10 +328,11 @@ if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'): img = self.xml.get_object('image7') img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU) - if not gajim.connections[self.account].private_storage_supported: - widget.hide() - else: - widget.show() + widget.set_sensitive( + gajim.connections[self.account].private_storage_supported or \ + (gajim.connections[self.account].pubsub_supported and \ + gajim.connections[self.account].pubsub_publish_options_supported)) + widget.show() widget = self.xml.get_object('list_treeview') id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded) @@ -843,7 +844,9 @@ if self.contact.jid in gajim.config.get_per('accounts', self.account, 'minimized_gc').split(' '): minimize_menuitem.set_active(True) - if not gajim.connections[self.account].private_storage_supported: + conn = gajim.connections[self.account] + if not conn.private_storage_supported and (not conn.pubsub_supported or \ + not conn.pubsub_publish_options_supported): bookmark_room_menuitem.set_sensitive(False) if gajim.gc_connected[self.account][self.room_jid]: c = gajim.contacts.get_gc_contact(self.account, self.room_jid,

1 0

gajim: hide 'bookmark_ button' if private storage not supported
by Fomin Denis 20 Nov '12

20 Nov '12

changeset 39d2f5181210 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=39d2f5181210 description: hide 'bookmark_ button' if private storage not supported diffstat: src/groupchat_control.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 6c6914187d03 -r 39d2f5181210 src/groupchat_control.py --- a/src/groupchat_control.py Sun Nov 18 23:46:43 2012 +0400 +++ b/src/groupchat_control.py Tue Nov 20 11:29:13 2012 +0400 @@ -328,8 +328,10 @@ if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'): img = self.xml.get_object('image7') img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU) - - widget.show() + if not gajim.connections[self.account].private_storage_supported: + widget.hide() + else: + widget.show() widget = self.xml.get_object('list_treeview') id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded)

1 0

gajim: prevent traceback
by Fomin Denis 18 Nov '12

18 Nov '12

changeset 6c6914187d03 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6c6914187d03 description: prevent traceback diffstat: src/common/helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r c71ab70fbd35 -r 6c6914187d03 src/common/helpers.py --- a/src/common/helpers.py Sat Nov 17 23:30:09 2012 +0400 +++ b/src/common/helpers.py Sun Nov 18 23:46:43 2012 +0400 @@ -1433,7 +1433,7 @@ except Exception: proxy = None p = gajim.config.get('global_proxy') - if p: + if p and p in gajim.config.get_per('proxies'): proxy = {} proxyptr = gajim.config.get_per('proxies', p) if not proxyptr:

1 0

gajim: [Darlan].Update Hebrew translation.
by Fomin Denis 17 Nov '12

17 Nov '12

changeset c71ab70fbd35 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c71ab70fbd35 description: [Darlan].Update Hebrew translation. diffstat: po/he.po | 1534 ++++++++++++++++++++++++++++++++----------------------------- 1 files changed, 804 insertions(+), 730 deletions(-) diffs (truncated from 4260 to 300 lines): diff -r 1ca106577a08 -r c71ab70fbd35 po/he.po --- a/po/he.po Thu Nov 15 15:01:21 2012 +0400 +++ b/po/he.po Sat Nov 17 23:30:09 2012 +0400 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-04 21:59+0400\n" -"PO-Revision-Date: 2012-10-04 20:28+0200\n" +"POT-Creation-Date: 2012-11-15 14:27+0400\n" +"PO-Revision-Date: 2012-11-17 21:33+0200\n" "Last-Translator: Isratine Citizen <genghiskhan(a)gmx.ca>\n" "Language-Team: Rahut\n" "Language: he\n" @@ -43,7 +43,7 @@ #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." -msgstr "הוספת _איש־קשר..." +msgstr "הוספת _איש קשר..." # איתור #: ../data/gui/account_context_menu.ui.h:6 @@ -213,10 +213,10 @@ #: ../src/config.py:2412 #: ../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/dialogs.py:313 +#: ../src/dialogs.py:315 +#: ../src/dialogs.py:521 +#: ../src/dialogs.py:534 #: ../src/roster_window.py:3214 #: ../src/roster_window.py:3220 #: ../src/roster_window.py:3225 @@ -229,21 +229,21 @@ #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:3 -#: ../src/dialogs.py:3425 -#: ../src/dialogs.py:3471 +#: ../src/dialogs.py:3426 +#: ../src/dialogs.py:3472 msgid "Add" msgstr "הוספה" #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:4 -#: ../src/dialogs.py:3429 -#: ../src/dialogs.py:3526 +#: ../src/dialogs.py:3430 +#: ../src/dialogs.py:3527 msgid "Delete" msgstr "מחיקה" #. Rename #: ../data/gui/accounts_window.ui.h:5 -#: ../src/roster_window.py:5827 +#: ../src/roster_window.py:5844 msgid "Re_name" msgstr "_שינוי שם" @@ -266,6 +266,7 @@ #. 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 @@ -276,14 +277,14 @@ msgstr "‫Gajim" # BUG: _underline -# אישי־קשר +# אישי קשר #: ../data/gui/accounts_window.ui.h:10 msgid "Synchronize contacts" -msgstr "סנכרון אנשי־קשר" +msgstr "סנכרון אנשי קשר" #: ../data/gui/accounts_window.ui.h:11 msgid "Click to request authorization to all contacts of another account" -msgstr "לחצו בכדי לבקש הרשאות עבור כל אנשי־הקשר שבחשבון אחר" +msgstr "לחצו בכדי לבקש הרשאות עבור כל אנשי קשר של בחשבון אחר" #: ../data/gui/accounts_window.ui.h:12 msgid "Chan_ge Password" @@ -292,7 +293,7 @@ # Omitted: Click to #: ../data/gui/accounts_window.ui.h:13 msgid "Click to change account's password" -msgstr "שינוי הסיסמה של החשבון" +msgstr "שינוי סיסמת חשבון" # מנהל, ניהול #: ../data/gui/accounts_window.ui.h:14 @@ -363,7 +364,7 @@ # יו_מני שיחות #: ../data/gui/accounts_window.ui.h:32 msgid "Save conversation _logs for all contacts" -msgstr "שמירת רשו_מות שיחה עבור כל אנשי־הקשר" +msgstr "שמירת רשו_מות שיחה עבור כל אנשי קשר" # כוללני #: ../data/gui/accounts_window.ui.h:33 @@ -398,11 +399,11 @@ #: ../data/gui/accounts_window.ui.h:37 #: ../data/gui/preferences_window.ui.h:46 #: ../src/common/contacts.py:135 -#: ../src/dialogs.py:112 -#: ../src/dialogs.py:124 +#: ../src/dialogs.py:113 +#: ../src/dialogs.py:125 #: ../src/roster_window.py:3156 #: ../src/roster_window.py:4284 -#: ../src/roster_window.py:5877 +#: ../src/roster_window.py:5894 msgid "General" msgstr "כללית" @@ -547,7 +548,7 @@ #: ../data/gui/accounts_window.ui.h:67 #: ../data/gui/zeroconf_information_window.ui.h:7 #: ../src/config.py:1862 -#: ../src/dialogs.py:838 +#: ../src/dialogs.py:839 msgid "Jabber ID:" msgstr "‫JID:" @@ -557,7 +558,7 @@ #: ../data/gui/add_new_contact_window.ui.h:1 msgid "Add New Contact" -msgstr "הוספת איש־קשר חדש" +msgstr "הוספת איש קשר חדש" #: ../data/gui/add_new_contact_window.ui.h:2 msgid "A_ccount:" @@ -574,7 +575,7 @@ #: ../data/gui/add_new_contact_window.ui.h:5 #: ../data/gui/manage_bookmarks_window.ui.h:5 msgid "_Nickname:" -msgstr "כי_נוי:" +msgstr "שם כי_נוי:" #: ../data/gui/add_new_contact_window.ui.h:6 msgid "_Group:" @@ -582,7 +583,7 @@ #: ../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 # בקשת @@ -599,26 +600,27 @@ "proceed." msgstr "" "נרשמת באמצעות מוביל זה\n" -"כדי שתהיה ביכולתך להוסיף איש־קשר\n" -"מפרוטוקול זה. נא להקיש על הלחצן\n" +"כדי שתהיה ביכולתך להוסיף איש קשר\n" +"מפרוטוקול זה. נא להקיש על לחצן\n" "הרשמה כדי להמשיך." #: ../data/gui/add_new_contact_window.ui.h:13 msgid "_Register" -msgstr "ה_רשמה" - +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 msgid "I would like to add you to my contact list." -msgstr "ברצוני להוסיפך אל רשימת אנשי־הקשר שלי." +msgstr "ברצוני להוסיפך אל רשימת הקשר שלי." #. displaying the window #: ../data/gui/adhoc_commands_window.ui.h:1 @@ -805,14 +807,14 @@ #: ../data/gui/blocked_contacts_window.ui.h:1 msgid "Blocked Contacts" -msgstr "אנשי־קשר חסומים" +msgstr "אנשי קשר חסומים" #: ../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:5846 -#: ../src/roster_window.py:5973 -#: ../src/roster_window.py:6106 +#: ../src/roster_window.py:5863 +#: ../src/roster_window.py:5990 +#: ../src/roster_window.py:6123 msgid "_Unblock" msgstr "_ביטול חסימה" @@ -915,7 +917,7 @@ #: ../data/gui/chat_control.ui.h:3 msgid "Add this contact to roster (Ctrl+D)" -msgstr "הוספת איש־קשר זה אל הרשימה (Ctrl+D)" +msgstr "הוספת איש קשר זה אל הרשימה (Ctrl+D)" #. change tooltip text for audio and video buttons if python-farstream is #. not installed @@ -931,14 +933,13 @@ msgid "Toggle video session" msgstr "הפעלת סשן וידאו" -# לשיחה #: ../data/gui/chat_control.ui.h:6 msgid "Invite contacts to the conversation (Ctrl+G)" -msgstr "הזמנת אנשי־קשר אל השיחה (Ctrl+G)" +msgstr "הזמנת אנשי קשר אל הדיון (Ctrl+G)" #: ../data/gui/chat_control.ui.h:7 msgid "Show the contact's profile (Ctrl+I)" -msgstr "הצגת דיוקן איש־קשר (Ctrl+I)" +msgstr "הצגת דיוקן איש קשר (Ctrl+I)" #: ../data/gui/chat_control.ui.h:8 #: ../data/gui/groupchat_control.ui.h:6 @@ -1018,7 +1019,7 @@ "Select the contacts you want to invite" msgstr "" "בחרת להתחיל שיחה מרובת משתתפים.\n" -"נא לבחור את אנשי־הקשר אותם ברצונך להזמין" +"נא לבחור את אנשי הקשר אותם ברצונך להזמין" # שרת MUC # נא לבחור שרת MUC (שיחה מרובת משתתפים). @@ -1051,14 +1052,14 @@ #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 #: ../data/gui/gc_occupants_menu.ui.h:11 -#: ../src/roster_window.py:5782 -#: ../src/roster_window.py:5941 +#: ../src/roster_window.py:5799 +#: ../src/roster_window.py:5958 msgid "In_vite to" msgstr "ה_זמנה אל" #: ../data/gui/contact_context_menu.ui.h:5 msgid "Invite _Contacts" -msgstr "הזמנת _אנשי־קשר" +msgstr "הזמנת _אנשי קשר" #: ../data/gui/contact_context_menu.ui.h:6 msgid "Toggle Open_PGP Encryption" @@ -1073,8 +1074,8 @@ msgstr "הפעלת הצפנת E2E" #: ../data/gui/contact_context_menu.ui.h:8 -#: ../src/roster_window.py:5792 -#: ../src/roster_window.py:6030 +#: ../src/roster_window.py:5809 +#: ../src/roster_window.py:6047 msgid "Send Cus_tom Status" msgstr "שליחת מצב־חיבור מו_תאם" @@ -1084,7 +1085,7 @@ #: ../data/gui/contact_context_menu.ui.h:10 msgid "M_anage Contact" -msgstr "_ניהול איש־קשר" +msgstr "_ניהול איש קשר" #: ../data/gui/contact_context_menu.ui.h:11 msgid "_Rename..." @@ -1108,29 +1109,29 @@ #: ../data/gui/contact_context_menu.ui.h:16 msgid "_Subscription" -msgstr "_רישום" +msgstr "ה_רשמה" # Changed to: Allow this contact to view my status -# לאיש־קשר זה +# לאיש קשר זה #: ../data/gui/contact_context_menu.ui.h:17 msgid "_Allow him/her to see my status" -msgstr "_התר לאיש־קשר זה לראות את מצב־חיבורי" +msgstr "_התר לאיש קשר זה לראות את מצב־חיבורי"

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2012