Commits December 2009

commits@gajim.org

8 participants
127 discussions

gajim: [dm] define an exception we use. Fixes #5457
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset d6b787792c5a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d6b787792c5a description: [dm] define an exception we use. Fixes #5457 diffstat: src/common/dbus_support.py | 2 +- src/common/exceptions.py | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diffs (37 lines): diff -r a3ed5afdf80c -r d6b787792c5a src/common/dbus_support.py --- a/src/common/dbus_support.py Tue Nov 24 15:06:04 2009 +0100 +++ b/src/common/dbus_support.py Tue Dec 01 17:41:43 2009 +0100 @@ -60,7 +60,7 @@ raise exceptions.DbusNotSupported if not self.present(): - raise exceptions.SystemBusNotPresent + raise exceptions.SystemBusNotPresent return self.system_bus def bus(self): diff -r a3ed5afdf80c -r d6b787792c5a src/common/exceptions.py --- a/src/common/exceptions.py Tue Nov 24 15:06:04 2009 +0100 +++ b/src/common/exceptions.py Tue Dec 01 17:41:43 2009 +0100 @@ -68,7 +68,20 @@ Exception.__init__(self) def __str__(self): - return _('Session bus is not available.\nTry reading http://trac.gajim.org/wiki/GajimDBus') + return _('Session bus is not available.\nTry reading %(url)s') % \ + {'url': 'http://trac.gajim.org/wiki/GajimDBus'} + +class SystemBusNotPresent(Exception): + """ + This exception indicates that there is no session daemon + """ + + def __init__(self): + Exception.__init__(self) + + def __str__(self): + return _('System bus is not available.\nTry reading %(url)s') % \ + {'url': 'http://trac.gajim.org/wiki/GajimDBus'} class NegotiationError(Exception): '''A session negotiation failed'''

1 0

gajim: auto-increment order value in privacy list entries. Fixes...
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset a3ed5afdf80c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a3ed5afdf80c description: auto-increment order value in privacy list entries. Fixes #5441 diffstat: src/dialogs.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diffs (39 lines): diff -r b2b96b55186c -r a3ed5afdf80c src/dialogs.py --- a/src/dialogs.py Mon Dec 28 23:36:15 2009 +0100 +++ b/src/dialogs.py Tue Nov 24 15:06:04 2009 +0100 @@ -3071,6 +3071,8 @@ self.global_rules = {} self.list_of_groups = {} + self.max_order = 0 + # Default Edit Values self.edit_rule_type = 'jid' self.allow_deny = 'allow' @@ -3166,6 +3168,8 @@ else: text_item = _('Order: %(order)s, action: %(action)s') % \ {'order': rule['order'], 'action': rule['action']} + if int(rule['order']) > self.max_order: + self.max_order = int(rule['order']) self.global_rules[text_item] = rule self.list_of_rules_combobox.append_text(text_item) if len(rules) == 0: @@ -3313,7 +3317,7 @@ self.edit_view_status_checkbutton.set_active(False) self.edit_send_status_checkbutton.set_active(False) self.edit_all_checkbutton.set_active(False) - self.edit_order_spinbutton.set_value(1) + self.edit_order_spinbutton.set_value(self.max_order + 1) self.edit_type_group_combobox.set_active(0) self.edit_type_subscription_combobox.set_active(0) self.add_edit_rule_label.set_label( @@ -3356,6 +3360,8 @@ def on_save_rule_button_clicked(self, widget): tags=[] current_tags = self.get_current_tags() + if int(current_tags['order']) > self.max_order: + self.max_order = int(current_tags['order']) if self.active_rule == '': tags.append(current_tags)

1 0

gajim: don't allow to disable a connecting account. Fixes #5522
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset b2b96b55186c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b2b96b55186c description: don't allow to disable a connecting account. Fixes #5522 diffstat: src/config.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (22 lines): diff -r d8fcc9dbb267 -r b2b96b55186c src/config.py --- a/src/config.py Mon Dec 14 18:09:25 2009 +0100 +++ b/src/config.py Mon Dec 28 23:36:15 2009 +0100 @@ -2275,7 +2275,7 @@ # normal account if self.ignore_events: return - if gajim.account_is_connected(self.current_account): + if gajim.connections[self.current_account].connected > 0: self.ignore_events = True self.xml.get_widget('enable_zeroconf_checkbutton2').set_active(True) self.ignore_events = False @@ -2309,7 +2309,8 @@ def on_enable_checkbutton1_toggled(self, widget): if self.ignore_events: return - if gajim.account_is_connected(self.current_account): + if gajim.connections[self.current_account].connected > 0: + # connecting or connected self.ignore_events = True self.xml.get_widget('enable_checkbutton1').set_active(True) self.ignore_events = False

1 0

gajim: [guillaume] add user-agent when downloading a remote imag...
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset d8fcc9dbb267 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d8fcc9dbb267 description: [guillaume] add user-agent when downloading a remote image. Fixes #5513 diffstat: src/htmltextview.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 0a23f9517675 -r d8fcc9dbb267 src/htmltextview.py --- a/src/htmltextview.py Mon Dec 14 17:47:14 2009 +0100 +++ b/src/htmltextview.py Mon Dec 14 18:09:25 2009 +0100 @@ -488,7 +488,9 @@ # Wait maximum 1s for connection socket.setdefaulttimeout(1) try: - f = urllib2.urlopen(attrs['src']) + req = urllib2.Request(attrs['src']) + req.add_header('User-Agent', 'Gajim ' + gajim.version) + f = urllib2.urlopen(req) except Exception, ex: gajim.log.debug('Error loading image %s ' % attrs['src'] + str(ex)) pixbuf = None

1 0

gajim: [Dave Cridland] try to encode username, realm and passwor...
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset 0a23f9517675 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0a23f9517675 description: [Dave Cridland] try to encode username, realm and password in iso-8859-1 when doing DIGEST-MD5 before computing the hash. Fixes #5512 diffstat: src/common/xmpp/auth_nb.py | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diffs (23 lines): diff -r 12de3ff0c7aa -r 0a23f9517675 src/common/xmpp/auth_nb.py --- a/src/common/xmpp/auth_nb.py Fri Dec 18 17:27:09 2009 +0100 +++ b/src/common/xmpp/auth_nb.py Mon Dec 14 17:47:14 2009 +0100 @@ -332,8 +332,17 @@ else: self.password = password if self.mechanism == 'DIGEST-MD5': - A1 = C([H(C([self.resp['username'], self.resp['realm'], - self.password])), self.resp['nonce'], self.resp['cnonce']]) + def convert_to_iso88591(string): + try: + string = string.decode('utf-8').encode('iso-8859-1') + except UnicodeEncodeError: + pass + return string + hash_username = convert_to_iso88591(self.resp['username']) + hash_realm = convert_to_iso88591(self.resp['realm']) + hash_password = convert_to_iso88591(self.password) + A1 = C([H(C([hash_username, hash_realm, hash_password])), + self.resp['nonce'], self.resp['cnonce']]) A2 = C(['AUTHENTICATE', self.resp['digest-uri']]) response= HH(C([HH(A1), self.resp['nonce'], self.resp['nc'], self.resp['cnonce'], self.resp['qop'], HH(A2)]))

1 0

gajim: ignore invalid SRV reply from libasyncns. Fixes #5507
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset 12de3ff0c7aa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=12de3ff0c7aa description: ignore invalid SRV reply from libasyncns. Fixes #5507 diffstat: src/common/resolver.py | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) diffs (58 lines): diff -r 528149518146 -r 12de3ff0c7aa src/common/resolver.py --- a/src/common/resolver.py Tue Dec 08 17:43:13 2009 +0100 +++ b/src/common/resolver.py Fri Dec 18 17:27:09 2009 +0100 @@ -23,8 +23,14 @@ import logging log = logging.getLogger('gajim.c.resolver') +if __name__ == '__main__': + sys.path.append('..') + from common import i18n + import common.configpaths + common.configpaths.gajimpaths.init(None) + from common import helpers -from xmpp.idlequeue import IdleCommand +from common.xmpp.idlequeue import IdleCommand # it is good to check validity of arguments, when calling system commands ns_type_pattern = re.compile('^[a-z]+$') @@ -125,18 +131,23 @@ while resq is not None: try: rl = resq.get_done() - except: + except Exception: rl = [] + hosts = [] + requested_type = resq.userdata['type'] + requested_host = resq.userdata['host'] if rl: for r in rl: + if r['type'] != requested_type: + # Answer doesn't contain valid SRV data + continue r['prio'] = r['pref'] - self._on_ready( - host = resq.userdata['host'], - type = resq.userdata['type'], - result_list = rl) + hosts.append(r) + self._on_ready(host=requested_host, type=requested_type, + result_list=hosts) try: resq = self.asyncns.get_next() - except: + except Exception: resq = None elif type(resq) == libasyncns.AddrInfoQuery: # getaddrinfo result (A or AAAA) @@ -319,6 +330,8 @@ win.add(hbox) win.show_all() gobject.timeout_add(200, idlequeue.process) + if USE_LIBASYNCNS: + gobject.timeout_add(200, resolver.process) gtk.main() # vim: se ts=3:

1 0

gajim: [dm] prevent traceback when pressing DEL on the merged ac...
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset 528149518146 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=528149518146 description: [dm] prevent traceback when pressing DEL on the merged account row. Fixes #5498 diffstat: src/roster_window.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (23 lines): diff -r 3985e2814885 -r 528149518146 src/roster_window.py --- a/src/roster_window.py Thu Dec 03 17:32:13 2009 +0100 +++ b/src/roster_window.py Tue Dec 08 17:43:13 2009 +0100 @@ -3071,6 +3071,9 @@ return type_ = model[list_of_paths[0]][C_TYPE] account = model[list_of_paths[0]][C_ACCOUNT].decode('utf-8') + if type_ in ('account', 'group', 'self_contact') or \ + account == gajim.ZEROCONF_ACC_NAME: + return list_ = [] for path in list_of_paths: if model[path][C_TYPE] != type_: @@ -3080,9 +3083,6 @@ contact = gajim.contacts.get_contact_with_highest_priority(account, jid) list_.append((contact, account)) - if type_ in ('account', 'group', 'self_contact') or \ - account == gajim.ZEROCONF_ACC_NAME: - return if type_ == 'contact': self.on_req_usub(widget, list_) elif type_ == 'agent':

1 0

gajim: update README file to depend on python-dbus >=0.81, which...
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset 3985e2814885 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3985e2814885 description: update README file to depend on python-dbus >=0.81, which is needed for bus.list_names() function. Fixes #5474 diffstat: README.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 129d51380871 -r 3985e2814885 README.html --- a/README.html Tue Dec 01 16:51:11 2009 +0100 +++ b/README.html Thu Dec 03 17:32:13 2009 +0100 @@ -38,7 +38,7 @@ <li>gnome-python-desktop (for GnomeKeyring support)</li> <li>notification-daemon or notify-python (and D-Bus) to get cooler popups</li> <li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li> -<li>python-dbus bindings (>=0.80)</li> +<li>python-dbus bindings (>=0.81)</li> <li>python-sexy to have clickable URLs in chat windows</li> <li>python-kerberos to use GSSAPI authentification. Note: version1.1 or higher is required</li> </ul>

1 0

gajim: don't show in roster / notification that a contact unsubs...
by Yann Leboulanger 29 Dec '09

29 Dec '09

changeset 129d51380871 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=129d51380871 description: don't show in roster / notification that a contact unsubscribed us if we already popup up the dialog. Fixes #5470 diffstat: src/gajim.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r aba914817486 -r 129d51380871 src/gajim.py --- a/src/gajim.py Mon Nov 30 14:58:43 2009 +0200 +++ b/src/gajim.py Tue Dec 01 16:51:11 2009 +0100 @@ -1050,6 +1050,7 @@ if helpers.allow_popup_window(account) or not self.systray_enabled: self.show_unsubscribed_dialog(account, contact) + return self.add_event(account, jid, 'unsubscribed', contact)

1 0

gajim: BaseException.message is deprecated since 2.6. Fixes #5465
by Alexander Cherniuk 29 Dec '09

29 Dec '09

changeset aba914817486 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aba914817486 description: BaseException.message is deprecated since 2.6. Fixes #5465 diffstat: src/command_system/errors.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (20 lines): diff -r bff58b7d18c3 -r aba914817486 src/command_system/errors.py --- a/src/command_system/errors.py Wed Nov 25 09:10:30 2009 +0200 +++ b/src/command_system/errors.py Mon Nov 30 14:58:43 2009 +0200 @@ -20,13 +20,15 @@ """ def __init__(self, message, command=None, name=None): + self.message = message + self.command = command self.name = name if command and not name: self.name = command.first_name - super(BaseError, self).__init__(message) + super(BaseError, self).__init__() class DefinitionError(BaseError): """

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2009