Commits November 2009

commits@gajim.org

9 participants
288 discussions

gajim: Merge local changes.
by Stephan Erb 24 Nov '09

24 Nov '09

changeset 760928d92cfa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=760928d92cfa description: Merge local changes. diffstat: AUTHORS | 2 +- Makefile.am | 1 - README.html | 5 +- configure.ac | 16 +- scripts/gajim.in | 1 - src/Makefile.am | 31 +- src/command_system/__init__.py | 2 +- src/command_system/dispatching.py | 2 +- src/command_system/errors.py | 2 +- src/command_system/framework.py | 2 +- src/command_system/implementation/__init__.py | 2 +- src/command_system/implementation/custom.py | 2 +- src/command_system/implementation/hosts.py | 2 +- src/command_system/implementation/middleware.py | 2 +- src/command_system/implementation/standard.py | 2 +- src/command_system/mapping.py | 2 +- src/common/connection_handlers.py | 4 +- src/config.py | 2 - src/dialogs.py | 8 +- src/eggtrayicon.c | 584 ----------------------------- src/eggtrayicon.h | 80 ---- src/features_window.py | 13 - src/groupchat_control.py | 11 +- src/gui_interface.py | 18 +- src/roster_window.py | 30 +- src/statusicon.py | 354 +++++++++++++++++- src/systray.py | 459 ---------------------- src/tooltips.py | 4 +- src/trayicon.defs | 59 -- src/trayicon.override | 47 -- src/trayiconmodule.c | 43 -- 31 files changed, 391 insertions(+), 1401 deletions(-) diffs (truncated from 2195 to 300 lines): diff -r 3d40810f62e8 -r 760928d92cfa AUTHORS --- a/AUTHORS Sun Nov 22 22:57:52 2009 +0100 +++ b/AUTHORS Tue Nov 24 16:04:58 2009 +0100 @@ -1,9 +1,9 @@ CURRENT DEVELOPERS: +Alexander Cherniuk (ts33kr AT gmail.com) Nikos Kouremenos (kourem AT gmail.com) Yann Leboulanger (asterix AT lagaule.org) Julien Pivotto (roidelapluie AT gmail.com) -red-agent (hell.director AT gmail.com) Jonathan Schleifer (js-gajim AT webkeks.org) Travis Shirk (travis AT pobox.com) Brendan Taylor (whateley AT gmail.com) diff -r 3d40810f62e8 -r 760928d92cfa Makefile.am --- a/Makefile.am Sun Nov 22 22:57:52 2009 +0100 +++ b/Makefile.am Tue Nov 24 16:04:58 2009 +0100 @@ -50,7 +50,6 @@ aclocal.m4 \ libtool \ po/POTFILES.in \ - src/trayicon_la-eggtrayicon.loT \ m4/intltool.m4 MAINTAINERCLEANDIRS = \ diff -r 3d40810f62e8 -r 760928d92cfa README.html --- a/README.html Sun Nov 22 22:57:52 2009 +0100 +++ b/README.html Tue Nov 24 16:04:58 2009 +0100 @@ -16,7 +16,7 @@ <h2>Runtime Requirements</h2> <ul> <li>python2.5 or higher</li> -<li>pygtk2.12 or higher</li> +<li>pygtk2.16 or higher</li> <li>python-libglade</li> <li>pysqlite2 (if you have python 2.5, you already have this)</li> </ul> @@ -34,7 +34,6 @@ <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li> -<li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li> <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> @@ -53,8 +52,6 @@ <ul> <li>python-dev</li> <li>python-gtk2-dev</li> -<li>libgtk2.0-dev aka. gtk2-devel</li> -<li>libgtkspell-dev (for the gtkspell module)</li> <li>intltool (>= 0.40.1)</li> </ul> diff -r 3d40810f62e8 -r 760928d92cfa configure.ac --- a/configure.ac Sun Nov 22 22:57:52 2009 +0100 +++ b/configure.ac Tue Nov 24 16:04:58 2009 +0100 @@ -39,7 +39,7 @@ dnl **** dnl pygtk and gtk+ dnl **** -PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.12.0 pygtk-2.0 >= 2.12.0]) +PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0]) AC_SUBST(PYGTK_CFLAGS) AC_SUBST(PYGTK_LIBS) PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` @@ -50,15 +50,6 @@ AC_MSG_ERROR([Python not found]) fi -dnl **** -dnl tray icon -dnl **** -AC_ARG_ENABLE(trayicon, - [ --disable-trayicon do not build trayicon module [default yes]], - enable_trayicon=$enableval, enable_trayicon=yes) -test "x$enable_trayicon" = "xyes" && have_trayicon=true || have_trayicon=false -AM_CONDITIONAL(BUILD_TRAYICON, $have_trayicon) - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" AC_SUBST(ACLOCAL_AMFLAGS) @@ -91,8 +82,3 @@ po/Makefile.in ]) AC_OUTPUT -echo " -***************************** - Build features: - trayicon ......... ${have_trayicon} -*****************************" diff -r 3d40810f62e8 -r 760928d92cfa scripts/gajim.in --- a/scripts/gajim.in Sun Nov 22 22:57:52 2009 +0100 +++ b/scripts/gajim.in Tue Nov 24 16:04:58 2009 +0100 @@ -33,5 +33,4 @@ PYTHON_EXEC=@PYTHON@ cd ${datadir}/src -export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim" exec ${PYTHON_EXEC} -OO $APP.py "$@" diff -r 3d40810f62e8 -r 760928d92cfa src/Makefile.am --- a/src/Makefile.am Sun Nov 22 22:57:52 2009 +0100 +++ b/src/Makefile.am Tue Nov 24 16:04:58 2009 +0100 @@ -1,31 +1,7 @@ -CLEANFILES = \ - trayicon.c INCLUDES = \ $(PYTHON_INCLUDES) export MACOSX_DEPLOYMENT_TARGET=10.4 -if BUILD_TRAYICON -trayiconlib_LTLIBRARIES = trayicon.la -trayiconlibdir = $(pkglibdir) -trayicon_la_LIBADD = $(PYGTK_LIBS) -trayicon_la_SOURCES = \ - eggtrayicon.c \ - trayiconmodule.c - -nodist_trayicon_la_SOURCES = \ - trayicon.c - -trayicon_la_LDFLAGS = \ - -module -avoid-version -trayicon_la_CFLAGS = $(PYGTK_CFLAGS) - -trayicon.c: - pygtk-codegen-2.0 --prefix trayicon \ - --register $(PYGTK_DEFS)/gdk-types.defs \ - --register $(PYGTK_DEFS)/gtk-types.defs \ - --override $(srcdir)/trayicon.override \ - $(srcdir)/trayicon.defs > $@ -endif gajimsrcdir = $(pkgdatadir)/src gajimsrc_PYTHON = $(srcdir)/*.py @@ -56,12 +32,7 @@ $(gajimsrc2_PYTHON) \ $(gajimsrc3_PYTHON) \ $(gajimsrc4_PYTHON) \ - $(gajimsrc5_PYTHON) \ - eggtrayicon.c \ - trayiconmodule.c \ - eggtrayicon.h \ - trayicon.defs \ - trayicon.override + $(gajimsrc5_PYTHON) dist-hook: rm -f $(distdir)/ipython_view.py diff -r 3d40810f62e8 -r 760928d92cfa src/command_system/__init__.py --- a/src/command_system/__init__.py Sun Nov 22 22:57:52 2009 +0100 +++ b/src/command_system/__init__.py Tue Nov 24 16:04:58 2009 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 3d40810f62e8 -r 760928d92cfa src/command_system/dispatching.py --- a/src/command_system/dispatching.py Sun Nov 22 22:57:52 2009 +0100 +++ b/src/command_system/dispatching.py Tue Nov 24 16:04:58 2009 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 3d40810f62e8 -r 760928d92cfa src/command_system/errors.py --- a/src/command_system/errors.py Sun Nov 22 22:57:52 2009 +0100 +++ b/src/command_system/errors.py Tue Nov 24 16:04:58 2009 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 3d40810f62e8 -r 760928d92cfa src/command_system/framework.py --- a/src/command_system/framework.py Sun Nov 22 22:57:52 2009 +0100 +++ b/src/command_system/framework.py Tue Nov 24 16:04:58 2009 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 3d40810f62e8 -r 760928d92cfa src/command_system/implementation/__init__.py --- a/src/command_system/implementation/__init__.py Sun Nov 22 22:57:52 2009 +0100 +++ b/src/command_system/implementation/__init__.py Tue Nov 24 16:04:58 2009 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 3d40810f62e8 -r 760928d92cfa src/command_system/implementation/custom.py --- a/src/command_system/implementation/custom.py Sun Nov 22 22:57:52 2009 +0100 +++ b/src/command_system/implementation/custom.py Tue Nov 24 16:04:58 2009 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 3d40810f62e8 -r 760928d92cfa src/command_system/implementation/hosts.py --- a/src/command_system/implementation/hosts.py Sun Nov 22 22:57:52 2009 +0100 +++ b/src/command_system/implementation/hosts.py Tue Nov 24 16:04:58 2009 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 3d40810f62e8 -r 760928d92cfa src/command_system/implementation/middleware.py --- a/src/command_system/implementation/middleware.py Sun Nov 22 22:57:52 2009 +0100 +++ b/src/command_system/implementation/middleware.py Tue Nov 24 16:04:58 2009 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 3d40810f62e8 -r 760928d92cfa src/command_system/implementation/standard.py --- a/src/command_system/implementation/standard.py Sun Nov 22 22:57:52 2009 +0100 +++ b/src/command_system/implementation/standard.py Tue Nov 24 16:04:58 2009 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 3d40810f62e8 -r 760928d92cfa src/command_system/mapping.py --- a/src/command_system/mapping.py Sun Nov 22 22:57:52 2009 +0100 +++ b/src/command_system/mapping.py Tue Nov 24 16:04:58 2009 +0100 @@ -1,4 +1,4 @@ -# Copyright (C) 2009 red-agent <hell.director(a)gmail.com> +# Copyright (C) 2009 Alexander Cherniuk <ts33kr(a)gmail.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -r 3d40810f62e8 -r 760928d92cfa src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Nov 22 22:57:52 2009 +0100 +++ b/src/common/connection_handlers.py Tue Nov 24 16:04:58 2009 +0100 @@ -1737,7 +1737,7 @@ # wrong answer return tzo = qp.getTag('tzo').getData() - if tzo == 'Z': + if tzo.lower() == 'z': tzo = '0:0' tzoh, tzom = tzo.split(':') utc_time = qp.getTag('utc').getData() @@ -1862,7 +1862,7 @@ log.warn('Invalid JID: %s, ignoring it' % item.getAttr('jid')) continue name = item.getAttr('name') - contact = gajim.contact.get_contact(self.name, jid) + contact = gajim.contacts.get_contact(self.name, jid) groups = [] same_groups = True for group in item.getTags('group'): diff -r 3d40810f62e8 -r 760928d92cfa src/config.py --- a/src/config.py Sun Nov 22 22:57:52 2009 +0100 +++ b/src/config.py Tue Nov 24 16:04:58 2009 +0100 @@ -297,8 +297,6 @@ systray_combobox.set_active(1) else: systray_combobox.set_active(2) - if not gajim.interface.systray_capabilities: - systray_combobox.set_sensitive(False) # sounds if gajim.config.get('sounds_on'): diff -r 3d40810f62e8 -r 760928d92cfa src/dialogs.py --- a/src/dialogs.py Sun Nov 22 22:57:52 2009 +0100 +++ b/src/dialogs.py Tue Nov 24 16:04:58 2009 +0100 @@ -3080,6 +3080,8 @@ self.global_rules = {} self.list_of_groups = {} + self.max_order = 0 + # Default Edit Values self.edit_rule_type = 'jid' self.allow_deny = 'allow' @@ -3175,6 +3177,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: @@ -3322,7 +3326,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)

1 0

gajim: Make dependencies of ConnectionPEP explicit.
by Stephan Erb 24 Nov '09

24 Nov '09

changeset 3d40810f62e8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3d40810f62e8 description: Make dependencies of ConnectionPEP explicit. This means ConnectionPEP now knows the objects on which it calls method. Before, it just assumed that: "it will be subclassed and that the subclass defines a few methods". Big advantage is that false positives in the pylint report are gone diffstat: src/common/connection_handlers.py | 2 ++ src/common/pep.py | 45 +++++++++++++++++++++++++-------------------- 2 files changed, 27 insertions(+), 20 deletions(-) diffs (155 lines): diff -r ea9320c5a401 -r 3d40810f62e8 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Nov 22 22:14:05 2009 +0100 +++ b/src/common/connection_handlers.py Sun Nov 22 22:57:52 2009 +0100 @@ -1458,6 +1458,8 @@ ConnectionBytestream.__init__(self) ConnectionCommands.__init__(self) ConnectionPubSub.__init__(self) + ConnectionPEP.__init__(self, account=self.name, dispatcher=self, + pubsub_connection=self) ConnectionJingle.__init__(self) ConnectionHandlersBase.__init__(self) self.gmail_url = None diff -r ea9320c5a401 -r 3d40810f62e8 src/common/pep.py --- a/src/common/pep.py Sun Nov 22 22:14:05 2009 +0100 +++ b/src/common/pep.py Sun Nov 22 22:57:52 2009 +0100 @@ -247,12 +247,12 @@ acc.pep[self.type] = self def asPixbufIcon(self): - '''To be implemented by subclasses''' - raise NotImplementedError + '''SHOULD be implemented by subclasses''' + return None def asMarkupText(self): - '''To be implemented by subclasses''' - raise NotImplementedError + '''SHOULD be implemented by subclasses''' + return '' class UserMoodPEP(AbstractPEP): @@ -287,14 +287,14 @@ def asMarkupText(self): assert not self._retracted untranslated_mood = self._pep_specific_data['mood'] - mood = _translate_mood(untranslated_mood) + mood = self._translate_mood(untranslated_mood) markuptext = '<b>%s</b>' % gobject.markup_escape_text(mood) if 'text' in self._pep_specific_data: text = self._pep_specific_data['text'] markuptext += ' (%s)' % gobject.markup_escape_text(text) return markuptext - def _translate_mood(mood): + def _translate_mood(self, mood): if mood in MOODS: return MOODS[mood] else: @@ -446,20 +446,25 @@ UserNicknamePEP] class ConnectionPEP(object): - + + def __init__(self, account, dispatcher, pubsub_connection): + self._account = account + self._dispatcher = dispatcher + self._pubsub_connection = pubsub_connection + def _pubsubEventCB(self, xmpp_dispatcher, msg): ''' Called when we receive <message /> with pubsub event. ''' if msg.getTag('error'): log.debug('PubsubEventCB received error stanza. Ignoring') - raise NodeProcessed + raise xmpp.NodeProcessed jid = helpers.get_full_jid_from_iq(msg) event_tag = msg.getTag('event') for pep_class in SUPPORTED_PERSONAL_USER_EVENTS: - pep = pep_class.get_tag_as_PEP(jid, self.name, event_tag) + pep = pep_class.get_tag_as_PEP(jid, self._account, event_tag) if pep: - self.dispatch('PEP_RECEIVED', (jid, pep.type)) + self._dispatcher.dispatch('PEP_RECEIVED', (jid, pep.type)) items = event_tag.getTag('items') if items: @@ -468,7 +473,8 @@ if entry: # for each entry in feed (there shouldn't be more than one, # but to be sure... - self.dispatch('ATOM_ENTRY', (atom.OldEntry(node=entry),)) + self._dispatcher.dispatch('ATOM_ENTRY', + (atom.OldEntry(node=entry),)) raise xmpp.NodeProcessed @@ -483,14 +489,14 @@ if message: i = item.addChild('text') i.addData(message) - self.send_pb_publish('', xmpp.NS_ACTIVITY, item, '0') + self._pubsub_connection.send_pb_publish('', xmpp.NS_ACTIVITY, item, '0') def retract_activity(self): if not self.pep_supported: return # not all server support retract, so send empty pep first self.send_activity(None) - self.send_pb_retract('', xmpp.NS_ACTIVITY, '0') + self._pubsub_connection.send_pb_retract('', xmpp.NS_ACTIVITY, '0') def send_mood(self, mood, message=None): if not self.pep_supported: @@ -501,13 +507,13 @@ if message: i = item.addChild('text') i.addData(message) - self.send_pb_publish('', xmpp.NS_MOOD, item, '0') + self._pubsub_connection.send_pb_publish('', xmpp.NS_MOOD, item, '0') def retract_mood(self): if not self.pep_supported: return self.send_mood(None) - self.send_pb_retract('', xmpp.NS_MOOD, '0') + self._pubsub_connection.send_pb_retract('', xmpp.NS_MOOD, '0') def send_tune(self, artist='', title='', source='', track=0, length=0, items=None): @@ -531,28 +537,27 @@ i.addData(length) if items: item.addChild(payload=items) - self.send_pb_publish('', xmpp.NS_TUNE, item, '0') + self._pubsub_connection.send_pb_publish('', xmpp.NS_TUNE, item, '0') def retract_tune(self): if not self.pep_supported: return # not all server support retract, so send empty pep first self.send_tune(None) - self.send_pb_retract('', xmpp.NS_TUNE, '0') + self._pubsub_connection.send_pb_retract('', xmpp.NS_TUNE, '0') def send_nickname(self, nick): if not self.pep_supported: return item = xmpp.Node('nick', {'xmlns': xmpp.NS_NICK}) item.addData(nick) - self.send_pb_publish('', xmpp.NS_NICK, item, '0') + self._pubsub_connection.send_pb_publish('', xmpp.NS_NICK, item, '0') def retract_nickname(self): if not self.pep_supported: return # not all server support retract, so send empty pep first self.send_nickname(None) - self.send_pb_retract('', xmpp.NS_NICK, '0') - + self._pubsub_connection.send_pb_retract('', xmpp.NS_NICK, '0') # vim: se ts=3:

1 0

gajim: Move function closer to where it is used.
by Stephan Erb 24 Nov '09

24 Nov '09

changeset ea9320c5a401 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ea9320c5a401 description: Move function closer to where it is used. This makes it easier to reason about its usage. diffstat: src/common/pep.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diffs (37 lines): diff -r bdecd4d14107 -r ea9320c5a401 src/common/pep.py --- a/src/common/pep.py Sun Nov 22 22:10:55 2009 +0100 +++ b/src/common/pep.py Sun Nov 22 22:14:05 2009 +0100 @@ -204,12 +204,6 @@ import gtkgui_helpers -def translate_mood(mood): - if mood in MOODS: - return MOODS[mood] - else: - return mood - class AbstractPEP(object): @@ -293,13 +287,19 @@ def asMarkupText(self): assert not self._retracted untranslated_mood = self._pep_specific_data['mood'] - mood = translate_mood(untranslated_mood) + mood = _translate_mood(untranslated_mood) markuptext = '<b>%s</b>' % gobject.markup_escape_text(mood) if 'text' in self._pep_specific_data: text = self._pep_specific_data['text'] markuptext += ' (%s)' % gobject.markup_escape_text(text) return markuptext + def _translate_mood(mood): + if mood in MOODS: + return MOODS[mood] + else: + return mood + class UserTunePEP(AbstractPEP): '''XEP-0118: User Tune'''

1 0

gajim: Remove TODO which was more or less a "might be useful one...
by Stephan Erb 24 Nov '09

24 Nov '09

changeset bdecd4d14107 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bdecd4d14107 description: Remove TODO which was more or less a "might be useful one day" diffstat: src/common/pep.py | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diffs (21 lines): diff -r e67a506dbc21 -r bdecd4d14107 src/common/pep.py --- a/src/common/pep.py Sun Nov 22 22:07:48 2009 +0100 +++ b/src/common/pep.py Sun Nov 22 22:10:55 2009 +0100 @@ -431,16 +431,13 @@ return (nick, retracted) def _update_contacts(self, jid, account): - # TODO: use dict instead nick = '' if self._retracted else self._pep_specific_data for contact in gajim.contacts.get_contacts(account, jid): contact.contact_name = nick def _update_account(self, account): - # TODO: use dict instead if self._retracted: - gajim.nicks[account] = gajim.config.get_per('accounts', - account, 'name') + gajim.nicks[account] = gajim.config.get_per('accounts', account, 'name') else: gajim.nicks[account] = self._pep_specific_data

1 0

gajim: Ignore error <message /> stanzas with event tag.
by Stephan Erb 24 Nov '09

24 Nov '09

changeset e67a506dbc21 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e67a506dbc21 description: Ignore error <message /> stanzas with event tag. This prevents dialogs poping up with showing "Service unavailable". diffstat: src/common/pep.py | 43 +++++++++++++++++++++---------------------- 1 files changed, 21 insertions(+), 22 deletions(-) diffs (141 lines): diff -r 02af28f35ad5 -r e67a506dbc21 src/common/pep.py --- a/src/common/pep.py Sun Nov 22 20:05:30 2009 +0200 +++ b/src/common/pep.py Sun Nov 22 22:07:48 2009 +0100 @@ -23,9 +23,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import common.gajim -from common import xmpp - MOODS = { 'afraid': _('Afraid'), 'amazed': _('Amazed'), @@ -194,16 +191,18 @@ TUNE_DATA = ['artist', 'title', 'source', 'track', 'length'] +import gobject +import gtk + import logging log = logging.getLogger('gajim.c.pep') -import helpers -import atom +from common import helpers +from common import atom +from common import xmpp +from common import gajim + import gtkgui_helpers -import gobject -import gajim -import gtk - def translate_mood(mood): if mood in MOODS: @@ -230,7 +229,7 @@ self._pep_specific_data, self._retracted = self._extract_info(items) self._update_contacts(jid, account) - if jid == common.gajim.get_jid_from_account(account): + if jid == gajim.get_jid_from_account(account): self._update_account(account) def _extract_info(self, items): @@ -238,7 +237,7 @@ raise NotImplementedError def _update_contacts(self, jid, account): - for contact in common.gajim.contacts.get_contacts(account, jid): + for contact in gajim.contacts.get_contacts(account, jid): if self._retracted: if self.type in contact.pep: del contact.pep[self.type] @@ -246,7 +245,7 @@ contact.pep[self.type] = self def _update_account(self, account): - acc = common.gajim.connections[account] + acc = gajim.connections[account] if self._retracted: if self.type in acc.pep: del acc.pep[self.type] @@ -266,7 +265,7 @@ '''XEP-0107: User Mood''' type = 'mood' - namespace = common.xmpp.NS_MOOD + namespace = xmpp.NS_MOOD def _extract_info(self, items): mood_dict = {} @@ -306,7 +305,7 @@ '''XEP-0118: User Tune''' type = 'tune' - namespace = common.xmpp.NS_TUNE + namespace = xmpp.NS_TUNE def _extract_info(self, items): tune_dict = {} @@ -352,7 +351,7 @@ '''XEP-0108: User Activity''' type = 'activity' - namespace = common.xmpp.NS_ACTIVITY + namespace = xmpp.NS_ACTIVITY def _extract_info(self, items): activity_dict = {} @@ -418,7 +417,7 @@ '''XEP-0172: User Nickname''' type = 'nickname' - namespace = common.xmpp.NS_NICK + namespace = xmpp.NS_NICK def _extract_info(self, items): nick = '' @@ -434,16 +433,16 @@ def _update_contacts(self, jid, account): # TODO: use dict instead nick = '' if self._retracted else self._pep_specific_data - for contact in common.gajim.contacts.get_contacts(account, jid): + for contact in gajim.contacts.get_contacts(account, jid): contact.contact_name = nick def _update_account(self, account): # TODO: use dict instead if self._retracted: - common.gajim.nicks[account] = common.gajim.config.get_per('accounts', + gajim.nicks[account] = gajim.config.get_per('accounts', account, 'name') else: - common.gajim.nicks[account] = self._pep_specific_data + gajim.nicks[account] = self._pep_specific_data SUPPORTED_PERSONAL_USER_EVENTS = [UserMoodPEP, UserTunePEP, UserActivityPEP, @@ -454,8 +453,8 @@ def _pubsubEventCB(self, xmpp_dispatcher, msg): ''' Called when we receive <message /> with pubsub event. ''' if msg.getTag('error'): - log.warning('PubsubEventCB received error stanza') - return + log.debug('PubsubEventCB received error stanza. Ignoring') + raise NodeProcessed jid = helpers.get_full_jid_from_iq(msg) event_tag = msg.getTag('event') @@ -474,7 +473,7 @@ # but to be sure... self.dispatch('ATOM_ENTRY', (atom.OldEntry(node=entry),)) - raise common.xmpp.NodeProcessed + raise xmpp.NodeProcessed def send_activity(self, activity, subactivity=None, message=None): if not self.pep_supported:

1 0

gajim: don't use removed variables
by Yann Leboulanger 24 Nov '09

24 Nov '09

changeset afabad06b732 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=afabad06b732 description: don't use removed variables diffstat: src/config.py | 2 -- src/roster_window.py | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diffs (28 lines): diff -r a8aa9c29f1fe -r afabad06b732 src/config.py --- a/src/config.py Tue Nov 24 15:41:16 2009 +0100 +++ b/src/config.py Tue Nov 24 15:42:31 2009 +0100 @@ -297,8 +297,6 @@ systray_combobox.set_active(1) else: systray_combobox.set_active(2) - if not gajim.interface.systray_capabilities: - systray_combobox.set_sensitive(False) # sounds if gajim.config.get('sounds_on'): diff -r a8aa9c29f1fe -r afabad06b732 src/roster_window.py --- a/src/roster_window.py Tue Nov 24 15:41:16 2009 +0100 +++ b/src/roster_window.py Tue Nov 24 15:42:31 2009 +0100 @@ -5809,10 +5809,8 @@ if gajim.config.get('show_roster_on_startup'): self.window.show_all() else: - if not gajim.config.get('trayicon') or not \ - gajim.interface.systray_capabilities: - # cannot happen via GUI, but I put this incase user touches - # config. without trayicon, he or she should see the roster! + if gajim.config.get('trayicon') != 'always': + # Without trayicon, user should see the roster! self.window.show_all() gajim.config.set('show_roster_on_startup', True)

1 0

gajim: fix strimg comparison according to locales. Fixes #4201
by Yann Leboulanger 24 Nov '09

24 Nov '09

changeset a8aa9c29f1fe in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a8aa9c29f1fe description: fix strimg comparison according to locales. Fixes #4201 diffstat: src/groupchat_control.py | 11 +++-------- src/roster_window.py | 24 +++++++++++++----------- 2 files changed, 16 insertions(+), 19 deletions(-) diffs (89 lines): diff -r 0acfffccaccb -r a8aa9c29f1fe src/groupchat_control.py --- a/src/groupchat_control.py Tue Nov 24 15:06:04 2009 +0100 +++ b/src/groupchat_control.py Tue Nov 24 15:41:16 2009 +0100 @@ -29,6 +29,7 @@ import os import time +import locale import gtk import pango import gobject @@ -394,9 +395,7 @@ nick1 = nick1.decode('utf-8') nick2 = nick2.decode('utf-8') if type1 == 'role': - if nick1 < nick2: - return -1 - return 1 + return locale.strcoll(nick1, nick2) if type1 == 'contact': gc_contact1 = gajim.contacts.get_gc_contact(self.account, self.room_jid, nick1) @@ -420,11 +419,7 @@ # We compare names name1 = gc_contact1.get_shown_name() name2 = gc_contact2.get_shown_name() - if name1.lower() < name2.lower(): - return -1 - if name2.lower() < name1.lower(): - return 1 - return 0 + return locale.strcoll(name1.lower(), name2.lower()) def on_msg_textview_populate_popup(self, textview, menu): '''we override the default context menu and we prepend Clear diff -r 0acfffccaccb -r a8aa9c29f1fe src/roster_window.py --- a/src/roster_window.py Tue Nov 24 15:06:04 2009 +0100 +++ b/src/roster_window.py Tue Nov 24 15:41:16 2009 +0100 @@ -38,6 +38,7 @@ import os import sys import time +import locale import common.sleepy import history_window @@ -1558,9 +1559,7 @@ account1 = account1.decode('utf-8') account2 = account2.decode('utf-8') if type1 == 'account': - if account1 < account2: - return -1 - return 1 + return locale.strcoll(account1, account2) jid1 = model[iter1][C_JID].decode('utf-8') jid2 = model[iter2][C_JID].decode('utf-8') if type1 == 'contact': @@ -1607,20 +1606,23 @@ elif show1 > show2: return 1 # We compare names - if name1.lower() < name2.lower(): + cmp_result = locale.strcoll(name1.lower(), name2.lower()) + if cmp_result < 0: return -1 - if name2.lower() < name1.lower(): + if cmp_result > 0: return 1 if type1 == 'contact' and type2 == 'contact': # We compare account names - if account1.lower() < account2.lower(): - return -1 - if account2.lower() < account1.lower(): + cmp_result = locale.strcoll(account1.lower(), account2.lower()) + if cmp_result < 0: + return -1 + if cmp_result > 0: return 1 # We compare jids - if jid1.lower() < jid2.lower(): - return -1 - if jid2.lower() < jid1.lower(): + cmp_result = locale.strcoll(jid1.lower(), jid2.lower()) + if cmp_result < 0: + return -1 + if cmp_result > 0: return 1 return 0

1 0

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

24 Nov '09

changeset 0acfffccaccb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0acfffccaccb 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 3e76ded0a0f0 -r 0acfffccaccb src/dialogs.py --- a/src/dialogs.py Tue Nov 24 14:33:49 2009 +0100 +++ b/src/dialogs.py Tue Nov 24 15:06:04 2009 +0100 @@ -3080,6 +3080,8 @@ self.global_rules = {} self.list_of_groups = {} + self.max_order = 0 + # Default Edit Values self.edit_rule_type = 'jid' self.allow_deny = 'allow' @@ -3175,6 +3177,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: @@ -3322,7 +3326,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( @@ -3365,6 +3369,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: egg.trayicon is dead. Light a candle :'(
by Yann Leboulanger 24 Nov '09

24 Nov '09

changeset 3e76ded0a0f0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3e76ded0a0f0 description: egg.trayicon is dead. Light a candle :'( Fixes #3021, #5246 diffstat: Makefile.am | 1 - README.html | 5 +- configure.ac | 16 +- scripts/gajim.in | 1 - src/Makefile.am | 31 +-- src/eggtrayicon.c | 584 ----------------------------------------------------- src/eggtrayicon.h | 80 ------- src/features_window.py | 13 - src/gui_interface.py | 18 +- src/statusicon.py | 354 +++++++++++++++++++++++++++++++- src/systray.py | 459 ----------------------------------------- src/tooltips.py | 4 +- src/trayicon.defs | 59 ----- src/trayicon.override | 47 ---- src/trayiconmodule.c | 43 --- 15 files changed, 353 insertions(+), 1362 deletions(-) diffs (truncated from 1917 to 300 lines): diff -r 5035367ab798 -r 3e76ded0a0f0 Makefile.am --- a/Makefile.am Tue Nov 24 14:24:35 2009 +0200 +++ b/Makefile.am Tue Nov 24 14:33:49 2009 +0100 @@ -50,7 +50,6 @@ aclocal.m4 \ libtool \ po/POTFILES.in \ - src/trayicon_la-eggtrayicon.loT \ m4/intltool.m4 MAINTAINERCLEANDIRS = \ diff -r 5035367ab798 -r 3e76ded0a0f0 README.html --- a/README.html Tue Nov 24 14:24:35 2009 +0200 +++ b/README.html Tue Nov 24 14:33:49 2009 +0100 @@ -16,7 +16,7 @@ <h2>Runtime Requirements</h2> <ul> <li>python2.5 or higher</li> -<li>pygtk2.12 or higher</li> +<li>pygtk2.16 or higher</li> <li>python-libglade</li> <li>pysqlite2 (if you have python 2.5, you already have this)</li> </ul> @@ -34,7 +34,6 @@ <li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> <li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> <li>gtkspell and aspell-LANG where lang is your locale eg. en, fr etc</li> -<li>GnomePythonExtras 2.10 or above (aka gnome-python-desktop) so you can avoid compiling trayicon and gtkspell</li> <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> @@ -53,8 +52,6 @@ <ul> <li>python-dev</li> <li>python-gtk2-dev</li> -<li>libgtk2.0-dev aka. gtk2-devel</li> -<li>libgtkspell-dev (for the gtkspell module)</li> <li>intltool (>= 0.40.1)</li> </ul> diff -r 5035367ab798 -r 3e76ded0a0f0 configure.ac --- a/configure.ac Tue Nov 24 14:24:35 2009 +0200 +++ b/configure.ac Tue Nov 24 14:33:49 2009 +0100 @@ -39,7 +39,7 @@ dnl **** dnl pygtk and gtk+ dnl **** -PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.12.0 pygtk-2.0 >= 2.12.0]) +PKG_CHECK_MODULES([PYGTK], [gtk+-2.0 >= 2.16.0 pygtk-2.0 >= 2.16.0]) AC_SUBST(PYGTK_CFLAGS) AC_SUBST(PYGTK_LIBS) PYGTK_DEFS=`$PKG_CONFIG --variable=defsdir pygtk-2.0` @@ -50,15 +50,6 @@ AC_MSG_ERROR([Python not found]) fi -dnl **** -dnl tray icon -dnl **** -AC_ARG_ENABLE(trayicon, - [ --disable-trayicon do not build trayicon module [default yes]], - enable_trayicon=$enableval, enable_trayicon=yes) -test "x$enable_trayicon" = "xyes" && have_trayicon=true || have_trayicon=false -AM_CONDITIONAL(BUILD_TRAYICON, $have_trayicon) - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" AC_SUBST(ACLOCAL_AMFLAGS) @@ -91,8 +82,3 @@ po/Makefile.in ]) AC_OUTPUT -echo " -***************************** - Build features: - trayicon ......... ${have_trayicon} -*****************************" diff -r 5035367ab798 -r 3e76ded0a0f0 scripts/gajim.in --- a/scripts/gajim.in Tue Nov 24 14:24:35 2009 +0200 +++ b/scripts/gajim.in Tue Nov 24 14:33:49 2009 +0100 @@ -33,5 +33,4 @@ PYTHON_EXEC=@PYTHON@ cd ${datadir}/src -export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim" exec ${PYTHON_EXEC} -OO $APP.py "$@" diff -r 5035367ab798 -r 3e76ded0a0f0 src/Makefile.am --- a/src/Makefile.am Tue Nov 24 14:24:35 2009 +0200 +++ b/src/Makefile.am Tue Nov 24 14:33:49 2009 +0100 @@ -1,31 +1,7 @@ -CLEANFILES = \ - trayicon.c INCLUDES = \ $(PYTHON_INCLUDES) export MACOSX_DEPLOYMENT_TARGET=10.4 -if BUILD_TRAYICON -trayiconlib_LTLIBRARIES = trayicon.la -trayiconlibdir = $(pkglibdir) -trayicon_la_LIBADD = $(PYGTK_LIBS) -trayicon_la_SOURCES = \ - eggtrayicon.c \ - trayiconmodule.c - -nodist_trayicon_la_SOURCES = \ - trayicon.c - -trayicon_la_LDFLAGS = \ - -module -avoid-version -trayicon_la_CFLAGS = $(PYGTK_CFLAGS) - -trayicon.c: - pygtk-codegen-2.0 --prefix trayicon \ - --register $(PYGTK_DEFS)/gdk-types.defs \ - --register $(PYGTK_DEFS)/gtk-types.defs \ - --override $(srcdir)/trayicon.override \ - $(srcdir)/trayicon.defs > $@ -endif gajimsrcdir = $(pkgdatadir)/src gajimsrc_PYTHON = $(srcdir)/*.py @@ -56,12 +32,7 @@ $(gajimsrc2_PYTHON) \ $(gajimsrc3_PYTHON) \ $(gajimsrc4_PYTHON) \ - $(gajimsrc5_PYTHON) \ - eggtrayicon.c \ - trayiconmodule.c \ - eggtrayicon.h \ - trayicon.defs \ - trayicon.override + $(gajimsrc5_PYTHON) dist-hook: rm -f $(distdir)/ipython_view.py diff -r 5035367ab798 -r 3e76ded0a0f0 src/eggtrayicon.c --- a/src/eggtrayicon.c Tue Nov 24 14:24:35 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,584 +0,0 @@ -/* eggtrayicon.c - * Copyright (C) 2002 Anders Carlsson <andersca(a)gnu.org> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include <string.h> -#include <glib/gi18n.h> -#include <libintl.h> - -#include "eggtrayicon.h" - -#include <gdkconfig.h> -#if defined (GDK_WINDOWING_X11) -#include <gdk/gdkx.h> -#include <X11/Xatom.h> -#elif defined (GDK_WINDOWING_WIN32) -#include <gdk/gdkwin32.h> -#endif - -#ifndef EGG_COMPILATION -#ifndef _ -#define _(x) dgettext (GETTEXT_PACKAGE, x) -#define N_(x) x -#endif -#else -#define _(x) x -#define N_(x) x -#endif - -#define SYSTEM_TRAY_REQUEST_DOCK 0 -#define SYSTEM_TRAY_BEGIN_MESSAGE 1 -#define SYSTEM_TRAY_CANCEL_MESSAGE 2 - -#define SYSTEM_TRAY_ORIENTATION_HORZ 0 -#define SYSTEM_TRAY_ORIENTATION_VERT 1 - -enum { - PROP_0, - PROP_ORIENTATION -}; - -static GtkPlugClass *parent_class = NULL; - -static void egg_tray_icon_init (EggTrayIcon *icon); -static void egg_tray_icon_class_init (EggTrayIconClass *klass); - -static void egg_tray_icon_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); - -static void egg_tray_icon_add (GtkContainer *container, GtkWidget *widget); - -static void egg_tray_icon_realize (GtkWidget *widget); -static void egg_tray_icon_unrealize (GtkWidget *widget); - -#ifdef GDK_WINDOWING_X11 -static void egg_tray_icon_update_manager_window (EggTrayIcon *icon, - gboolean dock_if_realized); -static void egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon); -#endif - -GType -egg_tray_icon_get_type (void) -{ - static GType our_type = 0; - - if (our_type == 0) - { - static const GTypeInfo our_info = - { - sizeof (EggTrayIconClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) egg_tray_icon_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof (EggTrayIcon), - 0, /* n_preallocs */ - (GInstanceInitFunc) egg_tray_icon_init - }; - - our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0); - } - - return our_type; -} - -static void -egg_tray_icon_init (EggTrayIcon *icon) -{ - icon->stamp = 1; - icon->orientation = GTK_ORIENTATION_HORIZONTAL; - - gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK); -} - -static void -egg_tray_icon_class_init (EggTrayIconClass *klass) -{ - GObjectClass *gobject_class = (GObjectClass *)klass; - GtkWidgetClass *widget_class = (GtkWidgetClass *)klass; - GtkContainerClass *container_class = (GtkContainerClass *)klass; - - parent_class = g_type_class_peek_parent (klass); - - gobject_class->get_property = egg_tray_icon_get_property; - - widget_class->realize = egg_tray_icon_realize; - widget_class->unrealize = egg_tray_icon_unrealize; - - container_class->add = egg_tray_icon_add; - - g_object_class_install_property (gobject_class, - PROP_ORIENTATION, - g_param_spec_enum ("orientation", - _("Orientation"), - _("The orientation of the tray."), - GTK_TYPE_ORIENTATION, - GTK_ORIENTATION_HORIZONTAL, - G_PARAM_READABLE)); - -#if defined (GDK_WINDOWING_X11) - /* Nothing */ -#elif defined (GDK_WINDOWING_WIN32) - g_warning ("Port eggtrayicon to Win32"); -#else - g_warning ("Port eggtrayicon to this GTK+ backend"); -#endif -} - -static void -egg_tray_icon_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - EggTrayIcon *icon = EGG_TRAY_ICON (object); - - switch (prop_id) - { - case PROP_ORIENTATION: - g_value_set_enum (value, icon->orientation); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break;

1 0

gajim: Fixed timezone parsing
by Alexander Cherniuk 24 Nov '09

24 Nov '09

changeset 5035367ab798 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5035367ab798 description: Fixed timezone parsing diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 06a41b7a2ca4 -r 5035367ab798 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Nov 24 12:20:40 2009 +0200 +++ b/src/common/connection_handlers.py Tue Nov 24 14:24:35 2009 +0200 @@ -1735,7 +1735,7 @@ # wrong answer return tzo = qp.getTag('tzo').getData() - if tzo == 'Z': + if tzo.lower() == 'z': tzo = '0:0' tzoh, tzom = tzo.split(':') utc_time = qp.getTag('utc').getData()

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
29
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2009