Commits October 2012

commits@gajim.org

3 participants
37 discussions

gajim: add support Network Manager 0.9 (NM_STATE_CONNECTED_GLOBA...
by Fomin Denis 30 Oct '12

30 Oct '12

changeset 6f0e22a69b08 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6f0e22a69b08 description: add support Network Manager 0.9 (NM_STATE_CONNECTED_GLOBAL = 70. A network device is connected, with global network connectivity.) diffstat: src/network_manager_listener.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 48536d028e08 -r 6f0e22a69b08 src/network_manager_listener.py --- a/src/network_manager_listener.py Sun Oct 14 18:21:30 2012 +0200 +++ b/src/network_manager_listener.py Thu Oct 18 00:36:57 2012 +0400 @@ -45,9 +45,10 @@ def state_changed(state): """ - For Network Manager 0.7 + For Network Manager 0.7 - 0.9 """ - if props.Get("org.freedesktop.NetworkManager", "State") == 3: + nm_state = props.Get("org.freedesktop.NetworkManager", "State") + if nm_state == 3 or nm_state == 70: for connection in gajim.connections.itervalues(): if gajim.config.get_per('accounts', connection.name, 'listen_to_network_manager') and connection.time_to_reconnect:

1 0

gajim: fix typo
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 48536d028e08 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=48536d028e08 description: fix typo diffstat: ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 734d02e7be50 -r 48536d028e08 ChangeLog --- a/ChangeLog Mon Oct 08 11:14:47 2012 +0200 +++ b/ChangeLog Sun Oct 14 18:21:30 2012 +0200 @@ -1,7 +1,7 @@ Gajim 0.15.1 (29 August 2012) * Switch from python-farsight to python-farstream - * improve performences + * improve performances * Fix roster filter with unicode chars * Fix connection to msn jabber server * Fix some GPG issues

1 0

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

30 Oct '12

changeset 734d02e7be50 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=734d02e7be50 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 1571a300a583 -r 734d02e7be50 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 30 Oct '12

30 Oct '12

changeset 1571a300a583 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1571a300a583 description: prevent some traceback. see #7152 diffstat: src/roster_window.py | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diffs (66 lines): diff -r 55f14a850972 -r 1571a300a583 src/roster_window.py --- a/src/roster_window.py Sun Sep 30 21:54:08 2012 +0200 +++ b/src/roster_window.py Sat Oct 06 19:07:48 2012 +0200 @@ -5019,7 +5019,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) @@ -5049,8 +5052,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: @@ -5112,7 +5118,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]: @@ -5136,7 +5145,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 @@ -5168,7 +5181,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: roster accel group func returns true
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 55f14a850972 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=55f14a850972 description: roster accel group func returns true diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e2ed21a816f2 -r 55f14a850972 src/roster_window.py --- a/src/roster_window.py Sun Sep 30 21:31:45 2012 +0200 +++ b/src/roster_window.py Sun Sep 30 21:54:08 2012 +0200 @@ -3530,7 +3530,7 @@ self.send_status(account, current_show, message) self.send_pep(account, pep_dict) dialogs.ChangeStatusMessageDialog(on_response, status) - return + return True def on_roster_treeview_button_press_event(self, widget, event): # hide tooltip, no matter the button is pressed

1 0

gajim: return True in accel_group callback. Fixes #5371, #6903
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset e2ed21a816f2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e2ed21a816f2 description: return True in accel_group callback. Fixes #5371, #6903 diffstat: src/message_window.py | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diffs (121 lines): diff -r cb335fd73a31 -r e2ed21a816f2 src/message_window.py --- a/src/message_window.py Wed Sep 26 16:03:18 2012 +0200 +++ b/src/message_window.py Sun Sep 30 21:31:45 2012 +0200 @@ -110,7 +110,7 @@ for key in keys: keyval, mod = gtk.accelerator_parse(key) accel_group.connect_group(keyval, mod, gtk.ACCEL_VISIBLE, - self.accel_group_func) + self.accel_group_func) self.window.add_accel_group(accel_group) # gtk+ doesn't make use of the motion notify on gtkwindow by default @@ -118,10 +118,10 @@ self.window.add_events(gtk.gdk.POINTER_MOTION_MASK) id_ = self.notebook.connect('switch-page', - self._on_notebook_switch_page) + self._on_notebook_switch_page) self.handlers[id_] = self.notebook id_ = self.notebook.connect('key-press-event', - self._on_notebook_key_press) + self._on_notebook_key_press) self.handlers[id_] = self.notebook # Tab customizations @@ -352,6 +352,7 @@ if modifier & gtk.gdk.CONTROL_MASK: if keyval == gtk.keysyms.h: # CTRL + h control._on_history_menuitem_activate() + return True elif control.type_id == message_control.TYPE_CHAT and \ keyval == gtk.keysyms.f: # CTRL + f # CTRL + f moves cursor one char forward when user uses Emacs @@ -359,28 +360,36 @@ if not gtk.settings_get_default().get_property( 'gtk-key-theme-name') == 'Emacs': control._on_send_file_menuitem_activate(None) + return True elif control.type_id == message_control.TYPE_CHAT and \ keyval == gtk.keysyms.g: # CTRL + g control._on_convert_to_gc_menuitem_activate(None) + return True elif control.type_id in (message_control.TYPE_CHAT, message_control.TYPE_PM) and keyval == gtk.keysyms.i: # CTRL + i control._on_contact_information_menuitem_activate(None) + return True elif keyval == gtk.keysyms.l or keyval == gtk.keysyms.L: # CTRL + l|L control.conv_textview.clear() + return True elif keyval == gtk.keysyms.u: # CTRL + u: emacs style clear line control.clear(control.msg_textview) + return True elif control.type_id == message_control.TYPE_GC and \ keyval == gtk.keysyms.b: # CTRL + b control._on_bookmark_room_menuitem_activate(None) + return True # Tab switch bindings elif keyval == gtk.keysyms.F4: # CTRL + F4 self.remove_tab(control, self.CLOSE_CTRL_KEY) + return True elif keyval == gtk.keysyms.w: # CTRL + w # CTRL + w removes latest word before sursor when User uses emacs # theme if not gtk.settings_get_default().get_property( 'gtk-key-theme-name') == 'Emacs': self.remove_tab(control, self.CLOSE_CTRL_KEY) + return True elif keyval in (gtk.keysyms.Page_Up, gtk.keysyms.Page_Down): # CTRL + PageUp | PageDown # Create event and send it to notebook @@ -390,12 +399,14 @@ event.state = gtk.gdk.CONTROL_MASK event.keyval = int(keyval) self.notebook.emit('key_press_event', event) + return True if modifier & gtk.gdk.SHIFT_MASK: # CTRL + SHIFT if control.type_id == message_control.TYPE_GC and \ keyval == gtk.keysyms.n: # CTRL + SHIFT + n control._on_change_nick_menuitem_activate(None) + return True # MOD1 (ALT) mask elif modifier & gtk.gdk.MOD1_MASK: # Tab switch bindings @@ -404,26 +415,34 @@ if new >= self.notebook.get_n_pages(): new = 0 self.notebook.set_current_page(new) + return True elif keyval == gtk.keysyms.Left: # ALT + LEFT new = self.notebook.get_current_page() - 1 if new < 0: new = self.notebook.get_n_pages() - 1 self.notebook.set_current_page(new) + return True elif chr(keyval) in st: # ALT + 1,2,3.. self.notebook.set_current_page(st.index(chr(keyval))) + return True elif keyval == gtk.keysyms.c: # ALT + C toggles chat buttons control.chat_buttons_set_visible(not control.hide_chat_buttons) + return True elif keyval == gtk.keysyms.m: # ALT + M show emoticons menu control.show_emoticons_menu() + return True elif keyval == gtk.keysyms.d: # ALT + D show actions menu control.on_actions_button_clicked(control.actions_button) + return True elif control.type_id == message_control.TYPE_GC and \ keyval == gtk.keysyms.t: # ALT + t control._on_change_subject_menuitem_activate(None) + return True # Close tab bindings elif keyval == gtk.keysyms.Escape and \ - gajim.config.get('escape_key_closes'): # Escape + gajim.config.get('escape_key_closes'): # Escape self.remove_tab(control, self.CLOSE_ESC) + return True def _on_close_button_clicked(self, button, control): """

1 0

gajim: ignore presences when nothing changed (status, status mes...
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset cb335fd73a31 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cb335fd73a31 description: ignore presences when nothing changed (status, status message, prio). Fixes #7210 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a61b09fd9534 -r cb335fd73a31 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Sep 19 17:20:45 2012 +0200 +++ b/src/common/connection_handlers.py Wed Sep 26 16:03:18 2012 +0200 @@ -844,7 +844,7 @@ if obj.old_show == obj.new_show and obj.contact.status == \ obj.status and obj.contact.priority == obj.prio: # no change - return + return True else: obj.contact = gajim.contacts.get_first_contact_from_jid(account, jid)

1 0

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

30 Oct '12

changeset a61b09fd9534 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a61b09fd9534 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 6e033f839fb3 -r a61b09fd9534 src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Tue Sep 18 17:24:51 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: print punycode encoded urls if they contain non-ascii cha...
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset 6e033f839fb3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6e033f839fb3 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 bf89721ffa82 -r 6e033f839fb3 src/conversation_textview.py --- a/src/conversation_textview.py Tue Sep 18 15:16:11 2012 +0200 +++ b/src/conversation_textview.py Tue Sep 18 17:24:51 2012 +0200 @@ -50,7 +50,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 @@ -1191,6 +1191,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: don't clear selection buffer when enabling roster filteri...
by Yann Leboulanger 30 Oct '12

30 Oct '12

changeset bf89721ffa82 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bf89721ffa82 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 fdc219b832af -r bf89721ffa82 src/roster_window.py --- a/src/roster_window.py Mon Sep 17 11:53:47 2012 +0200 +++ b/src/roster_window.py Tue Sep 18 15:16:11 2012 +0200 @@ -4409,6 +4409,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) @@ -4416,9 +4419,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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2012