Commits March 2009

commits@gajim.org

2 participants
55 discussions

[commit-gajim] r11172 - trunk/src/common/xmpp
by asterix＠gajim.org 18 Mar '09

18 Mar '09

Author: asterix Date: 2009-03-18 10:14:10 +0100 (Wed, 18 Mar 2009) New Revision: 11172 Modified: trunk/src/common/xmpp/auth_nb.py Log: handle GSSError exceptions. Fixes #4913 Modified: trunk/src/common/xmpp/auth_nb.py =================================================================== --- trunk/src/common/xmpp/auth_nb.py 2009-03-18 07:10:18 UTC (rev 11171) +++ trunk/src/common/xmpp/auth_nb.py 2009-03-18 09:14:10 UTC (rev 11172) @@ -196,35 +196,43 @@ self.mecs.remove('ANONYMOUS') node = Node('auth',attrs={'xmlns': NS_SASL, 'mechanism': 'ANONYMOUS'}) self.mechanism = 'ANONYMOUS' - elif 'GSSAPI' in self.mecs and have_kerberos: + self.startsasl = SASL_IN_PROCESS + self._owner.send(str(node)) + raise NodeProcessed + if 'GSSAPI' in self.mecs and have_kerberos: self.mecs.remove('GSSAPI') - self.gss_vc = kerberos.authGSSClientInit('xmpp@' + \ - self._owner.xmpp_hostname)[1] - kerberos.authGSSClientStep(self.gss_vc, '') - response = kerberos.authGSSClientResponse(self.gss_vc) - node=Node('auth',attrs={'xmlns': NS_SASL, 'mechanism': 'GSSAPI'}, - payload=(response or '')) - self.mechanism = 'GSSAPI' - self.gss_step = GSS_STATE_STEP - elif 'DIGEST-MD5' in self.mecs: + try: + self.gss_vc = kerberos.authGSSClientInit('xmpp@' + \ + self._owner.xmpp_hostname)[1] + kerberos.authGSSClientStep(self.gss_vc, '') + response = kerberos.authGSSClientResponse(self.gss_vc) + node=Node('auth',attrs={'xmlns': NS_SASL, 'mechanism': 'GSSAPI'}, + payload=(response or '')) + self.mechanism = 'GSSAPI' + self.gss_step = GSS_STATE_STEP + self.startsasl = SASL_IN_PROCESS + self._owner.send(str(node)) + raise NodeProcessed + except GSSError, e: + log.info('GSSAPI authentication failed: %s' % str(e) + if 'DIGEST-MD5' in self.mecs: self.mecs.remove('DIGEST-MD5') node = Node('auth',attrs={'xmlns': NS_SASL, 'mechanism': 'DIGEST-MD5'}) self.mechanism = 'DIGEST-MD5' - elif 'PLAIN' in self.mecs: + self.startsasl = SASL_IN_PROCESS + self._owner.send(str(node)) + raise NodeProcessed + if 'PLAIN' in self.mecs: self.mecs.remove('PLAIN') self.mechanism = 'PLAIN' self._owner._caller.get_password(self.set_password) self.startsasl = SASL_IN_PROCESS raise NodeProcessed - else: - self.startsasl = SASL_FAILURE - log.error('I can only use DIGEST-MD5, GSSAPI and PLAIN mecanisms.') - if self.on_sasl: - self.on_sasl() - return - self.startsasl = SASL_IN_PROCESS - self._owner.send(str(node)) - raise NodeProcessed + self.startsasl = SASL_FAILURE + log.error('I can only use DIGEST-MD5, GSSAPI and PLAIN mecanisms.') + if self.on_sasl: + self.on_sasl() + return def SASLHandler(self, conn, challenge): ''' Perform next SASL auth step. Used internally. '''

1 0

[commit-gajim] r11171 - trunk/src/common/xmpp
by asterix＠gajim.org 18 Mar '09

18 Mar '09

Author: asterix Date: 2009-03-18 08:10:18 +0100 (Wed, 18 Mar 2009) New Revision: 11171 Modified: trunk/src/common/xmpp/auth_nb.py Log: typo. Fixes #4912 Modified: trunk/src/common/xmpp/auth_nb.py =================================================================== --- trunk/src/common/xmpp/auth_nb.py 2009-03-17 19:35:52 UTC (rev 11170) +++ trunk/src/common/xmpp/auth_nb.py 2009-03-18 07:10:18 UTC (rev 11171) @@ -359,7 +359,7 @@ ''' Caches username, password and resource for auth. ''' PlugIn.__init__(self) self.user = user - if self.password is None: + if password is None: self.password = '' else: self.password = password

1 0

[commit-gajim] r11170 - trunk/src/common/xmpp
by asterix＠gajim.org 17 Mar '09

17 Mar '09

Author: asterix Date: 2009-03-17 20:35:52 +0100 (Tue, 17 Mar 2009) New Revision: 11170 Modified: trunk/src/common/xmpp/auth_nb.py Log: prevent traceback when password is not entered. Fixes #4912 Modified: trunk/src/common/xmpp/auth_nb.py =================================================================== --- trunk/src/common/xmpp/auth_nb.py 2009-03-16 09:54:57 UTC (rev 11169) +++ trunk/src/common/xmpp/auth_nb.py 2009-03-17 19:35:52 UTC (rev 11170) @@ -319,7 +319,10 @@ raise NodeProcessed def set_password(self, password): - self.password = password + if password is None: + self.password = '' + 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']]) @@ -356,7 +359,10 @@ ''' Caches username, password and resource for auth. ''' PlugIn.__init__(self) self.user = user - self.password= password + if self.password is None: + self.password = '' + else: + self.password = password self.resource = resource self.on_auth = on_auth

1 0

[commit-gajim] r11169 - trunk/src/common/xmpp
by asterix＠gajim.org 16 Mar '09

16 Mar '09

Author: asterix Date: 2009-03-16 10:54:57 +0100 (Mon, 16 Mar 2009) New Revision: 11169 Modified: trunk/src/common/xmpp/auth_nb.py Log: prevent Traceback when server replies badly to resource binding request. Fixes #4880 Modified: trunk/src/common/xmpp/auth_nb.py =================================================================== --- trunk/src/common/xmpp/auth_nb.py 2009-03-16 09:37:40 UTC (rev 11168) +++ trunk/src/common/xmpp/auth_nb.py 2009-03-16 09:54:57 UTC (rev 11169) @@ -484,15 +484,17 @@ def _on_bound(self, resp): if isResultNode(resp): - self.bound.append(resp.getTag('bind').getTagData('jid')) - log.info('Successfully bound %s.' % self.bound[-1]) - jid = JID(resp.getTag('bind').getTagData('jid')) - self._owner.User = jid.getNode() - self._owner.Resource = jid.getResource() - self._owner.SendAndWaitForResponse(Protocol('iq', typ='set', - payload=[Node('session', attrs={'xmlns':NS_SESSION})]), - func=self._on_session) - elif resp: + if resp.getTag('bind') and resp.getTag('bind').getTagData('jid'): + self.bound.append(resp.getTag('bind').getTagData('jid')) + log.info('Successfully bound %s.' % self.bound[-1]) + jid = JID(resp.getTag('bind').getTagData('jid')) + self._owner.User = jid.getNode() + self._owner.Resource = jid.getResource() + self._owner.SendAndWaitForResponse(Protocol('iq', typ='set', + payload=[Node('session', attrs={'xmlns':NS_SESSION})]), + func=self._on_session) + return + if resp: log.error('Binding failed: %s.' % resp.getTag('error')) self.on_bound(None) else:

1 0

[commit-gajim] r11168 - trunk/src
by asterix＠gajim.org 16 Mar '09

16 Mar '09

Author: asterix Date: 2009-03-16 10:37:40 +0100 (Mon, 16 Mar 2009) New Revision: 11168 Modified: trunk/src/roster_window.py Log: show only contact with subscription none of from in the bottom of roster. Fixes #4877, see #4778 Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2009-03-16 08:43:13 UTC (rev 11167) +++ trunk/src/roster_window.py 2009-03-16 09:37:40 UTC (rev 11168) @@ -1592,16 +1592,11 @@ return -1 sub1 = contact1.sub sub2 = contact2.sub - # both goes before - if sub1 == 'both' and sub2 != 'both': + # none and from goes after + if sub1 not in ['none', 'from'] and sub2 in ['none', 'from']: return -1 - if sub1 != 'both' and sub2 == 'both': + if sub1 in ['none', 'from'] and sub2 not in ['none', 'from']: return 1 - # none goes after - if sub1 != 'none' and sub2 == 'none': - return -1 - if sub1 == 'none' and sub2 != 'none': - return 1 if show1 < show2: return -1 elif show1 > show2:

1 0

[commit-gajim] r11167 - in trunk/src: . common
by asterix＠gajim.org 16 Mar '09

16 Mar '09

Author: asterix Date: 2009-03-16 09:43:13 +0100 (Mon, 16 Mar 2009) New Revision: 11167 Modified: trunk/src/common/gajim.py trunk/src/config.py trunk/src/gajim.py Log: do not enable zeroconf if avahi or bonjour is not available. Fixes #4891 Modified: trunk/src/common/gajim.py =================================================================== --- trunk/src/common/gajim.py 2009-03-15 12:11:50 UTC (rev 11166) +++ trunk/src/common/gajim.py 2009-03-16 08:43:13 UTC (rev 11167) @@ -148,6 +148,15 @@ # zeroconf account name ZEROCONF_ACC_NAME = 'Local' +HAVE_ZEROCONF = True +try: + import avahi +except ImportError: + try: + import pybonjour + except ImportError: + HAVE_ZEROCONF = False + HAVE_PYCRYPTO = True try: import Crypto Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2009-03-15 12:11:50 UTC (rev 11166) +++ trunk/src/config.py 2009-03-16 08:43:13 UTC (rev 11167) @@ -1499,8 +1499,11 @@ self.notebook.set_current_page(1) def init_zeroconf_account(self): - enable = gajim.config.get('enable_zeroconf') + enable = gajim.config.get('enable_zeroconf') and gajim.HAVE_ZEROCONF self.xml.get_widget('enable_zeroconf_checkbutton2').set_active(enable) + if not gajim.HAVE_ZEROCONF: + self.xml.get_widget('enable_zeroconf_checkbutton2').set_sensitive( + False) self.xml.get_widget('zeroconf_notebook').set_sensitive(enable) # General tab st = gajim.config.get_per('accounts', gajim.ZEROCONF_ACC_NAME, Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2009-03-15 12:11:50 UTC (rev 11166) +++ trunk/src/gajim.py 2009-03-16 08:43:13 UTC (rev 11167) @@ -3275,7 +3275,7 @@ gajim.proxy65_manager = proxy65_manager.Proxy65Manager(gajim.idlequeue) gajim.default_session_type = ChatControlSession self.register_handlers() - if gajim.config.get('enable_zeroconf'): + if gajim.config.get('enable_zeroconf') and gajim.HAVE_ZEROCONF: gajim.connections[gajim.ZEROCONF_ACC_NAME] = \ connection_zeroconf.ConnectionZeroconf(gajim.ZEROCONF_ACC_NAME) for account in gajim.config.get_per('accounts'):

1 0

[commit-gajim] r11166 - trunk/src
by asterix＠gajim.org 15 Mar '09

15 Mar '09

Author: asterix Date: 2009-03-15 13:11:50 +0100 (Sun, 15 Mar 2009) New Revision: 11166 Modified: trunk/src/notify.py Log: fix typo in dbus handling. Fixes #4905 Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2009-03-14 12:36:02 UTC (rev 11165) +++ trunk/src/notify.py 2009-03-15 12:11:50 UTC (rev 11166) @@ -585,7 +585,7 @@ text = ' ' actions = () if 'actions' in self.capabilities: - actions = (dbus.String('default'), dbus.String(self.event_type)), + actions = (dbus.String('default'), dbus.String(self.event_type)) self.notif.Notify( dbus.String(_('Gajim')), dbus.UInt32(0), # this notification does not replace other

1 0

[commit-gajim] r11165 - trunk/src
by asterix＠gajim.org 14 Mar '09

14 Mar '09

Author: asterix Date: 2009-03-14 13:36:02 +0100 (Sat, 14 Mar 2009) New Revision: 11165 Modified: trunk/src/dialogs.py Log: copyright is until 2009 Modified: trunk/src/dialogs.py =================================================================== --- trunk/src/dialogs.py 2009-03-14 11:30:09 UTC (rev 11164) +++ trunk/src/dialogs.py 2009-03-14 12:36:02 UTC (rev 11165) @@ -985,7 +985,7 @@ dlg.set_transient_for(gajim.interface.roster.window) dlg.set_name('Gajim') dlg.set_version(gajim.version) - s = u'Copyright © 2003-2008 Gajim Team' + s = u'Copyright © 2003-2009 Gajim Team' dlg.set_copyright(s) copying_file_path = self.get_path('COPYING') if copying_file_path:

1 0

[commit-gajim] r11164 - trunk/src
by asterix＠gajim.org 14 Mar '09

14 Mar '09

Author: asterix Date: 2009-03-14 12:30:09 +0100 (Sat, 14 Mar 2009) New Revision: 11164 Modified: trunk/src/gajim.py Log: close passphrases dialog when we are disconnected. Fixes #4702 Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2009-03-13 21:51:49 UTC (rev 11163) +++ trunk/src/gajim.py 2009-03-14 11:30:09 UTC (rev 11164) @@ -410,8 +410,13 @@ self.keyid = keyid self.callbacks = [] self.dialog_created = False + self.dialog = None self.completed = False + def interrupt(self): + self.dialog.window.destroy() + self.callbacks = [] + def run_callback(self, account, callback): gajim.connections[account].gpg_passphrase(self.passphrase) callback() @@ -467,7 +472,7 @@ # user failed 3 times, continue without GPG self.complete(None) - dialogs.PassphraseDialog(title, second, ok_handler=(_ok, 1), + self.dialog = dialogs.PassphraseDialog(title, second, ok_handler=(_ok, 1), cancel_handler=_cancel) self.dialog_created = True @@ -609,6 +614,9 @@ # iteration error self.instances[account]['online_dialog'][name].destroy() del self.instances[account]['online_dialog'][name] + for request in self.gpg_passphrase.values(): + if request: + request.interrupt() if status == 'offline': # sensitivity for this menuitem if gajim.get_number_of_connected_accounts() == 0:

1 0

[commit-gajim] r11163 - trunk/src
by asterix＠gajim.org 13 Mar '09

13 Mar '09

Author: asterix Date: 2009-03-13 22:51:49 +0100 (Fri, 13 Mar 2009) New Revision: 11163 Modified: trunk/src/notify.py Log: [James Westby] Don't use actions in notifications if the server doesn't support them. Fixes #4862 Modified: trunk/src/notify.py =================================================================== --- trunk/src/notify.py 2009-03-13 09:53:50 UTC (rev 11162) +++ trunk/src/notify.py 2009-03-13 21:51:49 UTC (rev 11163) @@ -372,8 +372,9 @@ notification.set_data('account', account) notification.set_data('msg_type', msg_type) notification.set_property('icon-name', path_to_image) - notification.add_action('default', 'Default Action', - on_pynotify_notification_clicked) + if 'actions' in pynotify.get_server_caps(): + notification.add_action('default', 'Default Action', + on_pynotify_notification_clicked) try: notification.show() @@ -507,6 +508,7 @@ if self.notif is None: raise dbus.DBusException('unable to get notifications interface') self.ntype = ntype + self.capabilities = self.notif.GetCapabilities() if self.kde_notifications: self.attempt_notify() @@ -522,6 +524,10 @@ 'text': self.text, 'image': self.path_to_image} gajim_icon = os.path.abspath(os.path.join(gajim.DATA_DIR, 'pixmaps', 'gajim.png')) + actions = () + if 'actions' in self.capabilities: + actions = (dbus.String('default'), dbus.String(self.event_type), + dbus.String('ignore'), dbus.String(_('Ignore'))) self.notif.Notify( dbus.String(_('Gajim')), # app_name (string) dbus.UInt32(0), # replaces_id (uint) @@ -529,9 +535,7 @@ dbus.String(gajim_icon), # app_icon (string) dbus.String(_('')), # summary (string) dbus.String(notification_text), # body (string) - # actions (stringlist) - (dbus.String('default'), dbus.String(self.event_type), - dbus.String('ignore'), dbus.String(_('Ignore'))), + actions, # actions (stringlist) [], # hints (not used in KDE yet) dbus.UInt32(timeout*1000), # timeout (int), in ms reply_handler=self.attach_by_id, @@ -539,6 +543,9 @@ return version = self.version if version[:2] == [0, 2]: + actions = {} + if 'actions' in self.capabilities: + actions = {'default': 0} try: self.notif.Notify( dbus.String(_('Gajim')), @@ -549,7 +556,7 @@ dbus.String(self.title), dbus.String(self.text), [dbus.String(self.path_to_image)], - {'default': 0}, + actions, [''], True, dbus.UInt32(timeout), @@ -576,13 +583,16 @@ text = self.text else: text = ' ' + actions = () + if 'actions' in self.capabilities: + actions = (dbus.String('default'), dbus.String(self.event_type)), self.notif.Notify( dbus.String(_('Gajim')), dbus.UInt32(0), # this notification does not replace other dbus.String(self.path_to_image), dbus.String(self.title), dbus.String(text), - ( dbus.String('default'), dbus.String(self.event_type) ), + actions, hints, dbus.UInt32(timeout*1000), reply_handler=self.attach_by_id,

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2009