Commits February 2009

commits@gajim.org

3 participants
80 discussions

[commit-gajim] r11107 - trunk/src/common
by asterix＠gajim.org 14 Feb '09

14 Feb '09

Author: asterix Date: 2009-02-14 19:56:17 +0100 (Sat, 14 Feb 2009) New Revision: 11107 Modified: trunk/src/common/connection_handlers.py Log: ignore wrong answer to XEP-202 (entity time) requests (Adium don't reply correctly). Fixes #4816 Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2009-02-14 16:41:31 UTC (rev 11106) +++ trunk/src/common/connection_handlers.py 2009-02-14 18:56:17 UTC (rev 11107) @@ -1651,6 +1651,9 @@ log.debug('TimeRevisedResultCB') time_info = '' qp = iq_obj.getTag('time') + if not qp: + # wrong answer + return tzo = qp.getTag('tzo').getData() if tzo == 'Z': tzo = '0:0'

1 0

[commit-gajim] r11106 - trunk/src/common
by asterix＠gajim.org 14 Feb '09

14 Feb '09

Author: asterix Date: 2009-02-14 17:41:31 +0100 (Sat, 14 Feb 2009) New Revision: 11106 Modified: trunk/src/common/proxy65_manager.py Log: re-enable proxy testing. see #4299 Modified: trunk/src/common/proxy65_manager.py =================================================================== --- trunk/src/common/proxy65_manager.py 2009-02-14 15:02:10 UTC (rev 11105) +++ trunk/src/common/proxy65_manager.py 2009-02-14 16:41:31 UTC (rev 11106) @@ -23,6 +23,8 @@ import socket import struct import errno +import logging +log = logging.getLogger('gajim.c.proxy65_manager') import common.xmpp from common import gajim @@ -106,19 +108,22 @@ self.jid = unicode(jid) self.state = S_RESOLVED #FIXME: re-enable proxy testing - self.state = S_FINISHED - #self.receiver_tester = ReceiverTester(self.host, self.port, self.jid, - # self.sid, self.sender_jid, self._on_receiver_success, - # self._on_connect_failure) - #self.receiver_tester.connect() + log.info('start resolving %s:%s' % (self.host, self.port)) + self.receiver_tester = ReceiverTester(self.host, self.port, self.jid, + self.sid, self.sender_jid, self._on_receiver_success, + self._on_connect_failure) + self.receiver_tester.connect() def _on_receiver_success(self): + log.debug('Receiver successfully connected %s:%s' % (self.host, + self.port)) self.host_tester = HostTester(self.host, self.port, self.jid, self.sid, self.sender_jid, self._on_connect_success, self._on_connect_failure) self.host_tester.connect() def _on_connect_success(self): + log.debug('Host successfully connected %s:%s' % (self.host, self.port)) iq = common.xmpp.Protocol(name='iq', to=self.jid, typ='set') query = iq.setTag('query') query.setNamespace(common.xmpp.NS_BYTESTREAM) @@ -128,13 +133,22 @@ activate.setData('test(a)gajim.org/test2') if self.active_connection: - self.active_connection.SendAndCallForResponse(iq, self.keep_conf) + log.debug('Activating bytestream on %s:%s' % (self.host, self.port)) + self.active_connection.SendAndCallForResponse(iq, + self._result_received) self.state = S_ACTIVATED else: self.state = S_INITIAL - def keep_conf(self, data=None): + def _result_received(self, data): self.disconnect(self.active_connection) + if data.getType() == 'result': + self.keep_conf() + else: + self._on_connect_failure() + + def keep_conf(self): + log.debug('Bytestream activated %s:%s' % (self.host, self.port)) self.state = S_FINISHED def _on_connect_failure(self): @@ -268,7 +282,9 @@ data = self._get_request_buff(self._get_sha1_auth()) self.send_raw(data) self.state += 1 + log.debug('Host authenticating to %s:%s' % (self.host, self.port)) elif self.state == 3: + log.debug('Host authenticated to %s:%s' % (self.host, self.port)) self.on_success() self.state += 1 @@ -276,6 +292,7 @@ try: self._sock.connect((self.host, self.port)) self._sock.setblocking(False) + log.debug('Host Connecting to %s:%s' % (self.host, self.port)) self._send = self._sock.send self._recv = self._sock.recv except Exception, ee: @@ -295,6 +312,7 @@ self._recv = self._sock.recv self.buff = '' self.state = 1 # connected + log.debug('Host connected to %s:%s' % (self.host, self.port)) self.idlequeue.plug_idle(self, True, False) return @@ -370,6 +388,7 @@ if version != 0x05 or method == 0xff: self.pollend() return + log.debug('Receiver authenticating to %s:%s' % (self.host, self.port)) data = self._get_request_buff(self._get_sha1_auth()) self.send_raw(data) self.state += 1 @@ -381,13 +400,15 @@ if version != 0x05 or reply != 0x00: self.pollend() return + log.debug('Receiver authenticated to %s:%s' % (self.host, self.port)) self.on_success() self.state += 1 def do_connect(self): try: + self._sock.setblocking(False) self._sock.connect((self.host, self.port)) - self._sock.setblocking(False) + log.debug('Receiver Connecting to %s:%s' % (self.host, self.port)) self._send = self._sock.send self._recv = self._sock.recv except Exception, ee: @@ -407,7 +428,7 @@ self._recv = self._sock.recv self.buff = '' self.state = 1 # connected + log.debug('Receiver connected to %s:%s' % (self.host, self.port)) self.idlequeue.plug_idle(self, True, False) - return # vim: se ts=3:

1 0

[commit-gajim] r11105 - in trunk/src/osx: . growl syncmenu
by js＠gajim.org 14 Feb '09

14 Feb '09

Author: js Date: 2009-02-14 16:02:10 +0100 (Sat, 14 Feb 2009) New Revision: 11105 Modified: trunk/src/osx/growl/_growl.c trunk/src/osx/growl/_growlImage.m trunk/src/osx/nsapp.m trunk/src/osx/syncmenu/pysyncmenu.c Log: Fix serious copyright and license issues, which were introduced as a reaction to #4200. Modified: trunk/src/osx/growl/_growl.c =================================================================== --- trunk/src/osx/growl/_growl.c 2009-02-14 15:00:12 UTC (rev 11104) +++ trunk/src/osx/growl/_growl.c 2009-02-14 15:02:10 UTC (rev 11105) @@ -2,25 +2,6 @@ * Copyright 2004-2005 The Growl Project. * Created by Jeremy Rossi <jeremy(a)jeremyrossi.com> * Released under the BSD license. - * - * src/osx/growl/_growl.c - * - * Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> - * - * This file is part of Gajim. - * - * Gajim is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; version 3 only. - * - * Gajim 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Gajim. If not, see <http://www.gnu.org/licenses/>. - * */ #include <Python.h> Modified: trunk/src/osx/growl/_growlImage.m =================================================================== --- trunk/src/osx/growl/_growlImage.m 2009-02-14 15:00:12 UTC (rev 11104) +++ trunk/src/osx/growl/_growlImage.m 2009-02-14 15:02:10 UTC (rev 11105) @@ -1,24 +1,6 @@ /* * Copyright 2004 Mark Rowe <bdash(a)users.sourceforge.net> * Released under the BSD license. - * src/osx/growl/_growlImage.m - * - * Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> - * - * This file is part of Gajim. - * - * Gajim is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; version 3 only. - * - * Gajim 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Gajim. If not, see <http://www.gnu.org/licenses/>. - * */ #include "Python.h" Modified: trunk/src/osx/nsapp.m =================================================================== --- trunk/src/osx/nsapp.m 2009-02-14 15:00:12 UTC (rev 11104) +++ trunk/src/osx/nsapp.m 2009-02-14 15:02:10 UTC (rev 11105) @@ -1,24 +1,3 @@ -/* -## src/osx/nsapp.m -## -## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim 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 General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## -*/ - #import "nsapp.h" #include <notify.h> Modified: trunk/src/osx/syncmenu/pysyncmenu.c =================================================================== --- trunk/src/osx/syncmenu/pysyncmenu.c 2009-02-14 15:00:12 UTC (rev 11104) +++ trunk/src/osx/syncmenu/pysyncmenu.c 2009-02-14 15:02:10 UTC (rev 11105) @@ -1,24 +1,3 @@ -/* -## src/osx/syncmenu/pysyncmenu.c -## -## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim 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 General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - */ - #include <errno.h> #include <string.h> #include <Python.h>

1 0

[commit-gajim] r11104 - in branches/osx_newbuildsys/src/osx: growl/growlImage_m growl/growl_c nsapp_m syncmenu/syncmenu_c
by js＠gajim.org 14 Feb '09

14 Feb '09

Author: js Date: 2009-02-14 16:00:12 +0100 (Sat, 14 Feb 2009) New Revision: 11104 Modified: branches/osx_newbuildsys/src/osx/growl/growlImage_m/_growlImage.m branches/osx_newbuildsys/src/osx/growl/growl_c/_growl.c branches/osx_newbuildsys/src/osx/nsapp_m/nsapp.m branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/pysyncmenu.c Log: You can't just re-release BSDL code as GPL! And you can't claim copyright if you didn't write it! Modified: branches/osx_newbuildsys/src/osx/growl/growlImage_m/_growlImage.m =================================================================== --- branches/osx_newbuildsys/src/osx/growl/growlImage_m/_growlImage.m 2009-02-14 14:54:02 UTC (rev 11103) +++ branches/osx_newbuildsys/src/osx/growl/growlImage_m/_growlImage.m 2009-02-14 15:00:12 UTC (rev 11104) @@ -1,7 +1,6 @@ /* * Copyright 2004 Mark Rowe <bdash(a)users.sourceforge.net> * Released under the BSD license. - * src/osx/growl/_growlImage.m */ #include "Python.h" Modified: branches/osx_newbuildsys/src/osx/growl/growl_c/_growl.c =================================================================== --- branches/osx_newbuildsys/src/osx/growl/growl_c/_growl.c 2009-02-14 14:54:02 UTC (rev 11103) +++ branches/osx_newbuildsys/src/osx/growl/growl_c/_growl.c 2009-02-14 15:00:12 UTC (rev 11104) @@ -2,8 +2,6 @@ * Copyright 2004-2005 The Growl Project. * Created by Jeremy Rossi <jeremy(a)jeremyrossi.com> * Released under the BSD license. - * - * src/osx/growl/_growl.c */ #include <Python.h> Modified: branches/osx_newbuildsys/src/osx/nsapp_m/nsapp.m =================================================================== --- branches/osx_newbuildsys/src/osx/nsapp_m/nsapp.m 2009-02-14 14:54:02 UTC (rev 11103) +++ branches/osx_newbuildsys/src/osx/nsapp_m/nsapp.m 2009-02-14 15:00:12 UTC (rev 11104) @@ -1,24 +1,3 @@ -/* -## src/osx/nsapp.m -## -## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim 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 General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## -*/ - #import "nsapp.h" #include <notify.h> Modified: branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/pysyncmenu.c =================================================================== --- branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/pysyncmenu.c 2009-02-14 14:54:02 UTC (rev 11103) +++ branches/osx_newbuildsys/src/osx/syncmenu/syncmenu_c/pysyncmenu.c 2009-02-14 15:00:12 UTC (rev 11104) @@ -1,24 +1,3 @@ -/* -## src/osx/syncmenu/syncmenu_c/pysyncmenu.c -## -## Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> -## -## This file is part of Gajim. -## -## Gajim is free software; you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published -## by the Free Software Foundation; version 3 only. -## -## Gajim 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 General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -## - */ - #include <errno.h> #include <string.h> #include <Python.h>

1 0

[commit-gajim] r11103 - branches/osx_newbuildsys/src/osx/growl/growlImage_m
by js＠gajim.org 14 Feb '09

14 Feb '09

Author: js Date: 2009-02-14 15:54:02 +0100 (Sat, 14 Feb 2009) New Revision: 11103 Modified: branches/osx_newbuildsys/src/osx/growl/growlImage_m/_growlImage.m Log: Another wrong copyright and license violation. Modified: branches/osx_newbuildsys/src/osx/growl/growlImage_m/_growlImage.m =================================================================== --- branches/osx_newbuildsys/src/osx/growl/growlImage_m/_growlImage.m 2009-02-14 14:51:31 UTC (rev 11102) +++ branches/osx_newbuildsys/src/osx/growl/growlImage_m/_growlImage.m 2009-02-14 14:54:02 UTC (rev 11103) @@ -2,23 +2,6 @@ * Copyright 2004 Mark Rowe <bdash(a)users.sourceforge.net> * Released under the BSD license. * src/osx/growl/_growlImage.m - * - * Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> - * - * This file is part of Gajim. - * - * Gajim is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; version 3 only. - * - * Gajim 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Gajim. If not, see <http://www.gnu.org/licenses/>. - * */ #include "Python.h"

1 0

[commit-gajim] r11102 - branches/osx_newbuildsys/src/osx/growl/growl_c
by js＠gajim.org 14 Feb '09

14 Feb '09

Author: js Date: 2009-02-14 15:51:31 +0100 (Sat, 14 Feb 2009) New Revision: 11102 Modified: branches/osx_newbuildsys/src/osx/growl/growl_c/_growl.c Log: DON'T append the GPL to a BSD licensed file! This is clearly a license violation! Also, don't claim false copyright! Modified: branches/osx_newbuildsys/src/osx/growl/growl_c/_growl.c =================================================================== --- branches/osx_newbuildsys/src/osx/growl/growl_c/_growl.c 2009-02-14 14:39:05 UTC (rev 11101) +++ branches/osx_newbuildsys/src/osx/growl/growl_c/_growl.c 2009-02-14 14:51:31 UTC (rev 11102) @@ -4,23 +4,6 @@ * Released under the BSD license. * * src/osx/growl/_growl.c - * - * Copyright (C) 2007 Yann Leboulanger <asterix AT lagaule.org> - * - * This file is part of Gajim. - * - * Gajim is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; version 3 only. - * - * Gajim 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Gajim. If not, see <http://www.gnu.org/licenses/>. - * */ #include <Python.h>

1 0

[commit-gajim] r11101 - in branches/osx_newbuildsys/src: common osx/nsapp_m
by js＠gajim.org 14 Feb '09

14 Feb '09

Author: js Date: 2009-02-14 15:39:05 +0100 (Sat, 14 Feb 2009) New Revision: 11101 Modified: branches/osx_newbuildsys/src/common/helpers.py branches/osx_newbuildsys/src/osx/nsapp_m/nsapp.m Log: Remove playFile from nsapp, use pyobjc instead. Modified: branches/osx_newbuildsys/src/common/helpers.py =================================================================== --- branches/osx_newbuildsys/src/common/helpers.py 2009-02-14 14:27:22 UTC (rev 11100) +++ branches/osx_newbuildsys/src/common/helpers.py 2009-02-14 14:39:05 UTC (rev 11101) @@ -53,6 +53,12 @@ except Exception: pass +if sys.platform == 'darwin': + try: + from Cocoa import NSSound + except ImportError: + pass + special_groups = (_('Transports'), _('Not in Roster'), _('Observers'), _('Groupchats')) class InvalidFormat(Exception): @@ -771,9 +777,9 @@ return if sys.platform == 'darwin': try: - from osx import nsapp - nsapp.playFile(path_to_soundfile) - except ImportError: + snd = NSSound.alloc() + snd.initWithContentsOfFile_byReference_(path_to_soundfile, True).play() + except NameError: pass elif os.name == 'nt': try: Modified: branches/osx_newbuildsys/src/osx/nsapp_m/nsapp.m =================================================================== --- branches/osx_newbuildsys/src/osx/nsapp_m/nsapp.m 2009-02-14 14:27:22 UTC (rev 11100) +++ branches/osx_newbuildsys/src/osx/nsapp_m/nsapp.m 2009-02-14 14:39:05 UTC (rev 11101) @@ -173,37 +173,6 @@ return Py_None; } -static PyObject * nsapp_playFile(PyObject *self, PyObject *args) -{ - GAJIM_POOL_ALLOC - - const char* cstr = NULL; - - if (!PyArg_ParseTuple(args, "s", &cstr)) - { - return NULL; - } - - NSSound* snd = [[NSSound alloc] initWithContentsOfFile: - [[NSString alloc] initWithUTF8String: cstr] - byReference: YES]; - if (!snd) - { - Py_INCREF(Py_None); - return Py_None; - } - - if (![snd play]) - { - Py_INCREF(Py_None); - return Py_None; - } - - GAJIM_POOL_FREE - - return Py_BuildValue("b", 1); -} - static PyObject * nsapp_getBundlePath(PyObject *self, PyObject *args) { GAJIM_POOL_ALLOC @@ -237,8 +206,6 @@ "Callback to call when the network state changes"}, {"getBundlePath", nsapp_getBundlePath, METH_VARARGS, "Get the path to the bundle we were run from"}, - {"playFile", nsapp_playFile, METH_VARARGS, - "Play a sound file"}, {NULL, NULL, 0, NULL} };

1 0

[commit-gajim] r11100 - in branches/osx_newbuildsys/src: . osx/nsapp_m
by js＠gajim.org 14 Feb '09

14 Feb '09

Author: js Date: 2009-02-14 15:27:22 +0100 (Sat, 14 Feb 2009) New Revision: 11100 Modified: branches/osx_newbuildsys/src/dock.py branches/osx_newbuildsys/src/osx/nsapp_m/nsapp.m Log: Do requestUserAttention with pyobjc instead of with some objc code. Modified: branches/osx_newbuildsys/src/dock.py =================================================================== --- branches/osx_newbuildsys/src/dock.py 2009-02-14 13:48:27 UTC (rev 11099) +++ branches/osx_newbuildsys/src/dock.py 2009-02-14 14:27:22 UTC (rev 11100) @@ -21,7 +21,6 @@ import os from common import gajim from common import helpers -import osx HAS_SYSTRAY_CAPABILITIES = True DOCK_IMAGES = {} @@ -78,7 +77,7 @@ def bounce(self): try: - osx.nsapp.requestUserAttention() + NSApp.requestUserAttention_(NSInformationalRequest) except NameError: pass Modified: branches/osx_newbuildsys/src/osx/nsapp_m/nsapp.m =================================================================== --- branches/osx_newbuildsys/src/osx/nsapp_m/nsapp.m 2009-02-14 13:48:27 UTC (rev 11099) +++ branches/osx_newbuildsys/src/osx/nsapp_m/nsapp.m 2009-02-14 14:27:22 UTC (rev 11100) @@ -173,16 +173,6 @@ return Py_None; } -static PyObject * nsapp_requestUserAttention(PyObject *self, PyObject *args) -{ - GAJIM_POOL_ALLOC - [NSApp requestUserAttention:NSInformationalRequest]; - GAJIM_POOL_FREE - - Py_INCREF(Py_None); - return Py_None; -} - static PyObject * nsapp_playFile(PyObject *self, PyObject *args) { GAJIM_POOL_ALLOC @@ -249,8 +239,6 @@ "Get the path to the bundle we were run from"}, {"playFile", nsapp_playFile, METH_VARARGS, "Play a sound file"}, - {"requestUserAttention", nsapp_requestUserAttention, METH_VARARGS, - "Sends a request for the users attention to the window manager"}, {NULL, NULL, 0, NULL} };

1 0

[commit-gajim] r11099 - branches/osx_newbuildsys/src/common
by js＠gajim.org 14 Feb '09

14 Feb '09

Author: js Date: 2009-02-14 14:48:27 +0100 (Sat, 14 Feb 2009) New Revision: 11099 Modified: branches/osx_newbuildsys/src/common/helpers.py Log: Fix sounds on OS X. After a few merges, it didn't work anymore. Modified: branches/osx_newbuildsys/src/common/helpers.py =================================================================== --- branches/osx_newbuildsys/src/common/helpers.py 2009-02-14 13:01:57 UTC (rev 11098) +++ branches/osx_newbuildsys/src/common/helpers.py 2009-02-14 13:48:27 UTC (rev 11099) @@ -638,12 +638,6 @@ import gajim -try: - from osx import nsapp -except ImportError: - pass - - def convert_bytes(string): suffix = '' # IEC standard says KiB = 1024 bytes KB = 1000 bytes @@ -777,8 +771,9 @@ return if sys.platform == 'darwin': try: + from osx import nsapp nsapp.playFile(path_to_soundfile) - except NameError: + except ImportError: pass elif os.name == 'nt': try:

1 0

[commit-gajim] r11098 - trunk/src
by js＠gajim.org 14 Feb '09

14 Feb '09

Author: js Date: 2009-02-14 14:01:57 +0100 (Sat, 14 Feb 2009) New Revision: 11098 Modified: trunk/src/statusicon.py Log: statusicon.py was incompatible with r11080. Fixed. Modified: trunk/src/statusicon.py =================================================================== --- trunk/src/statusicon.py 2009-02-14 13:00:24 UTC (rev 11097) +++ trunk/src/statusicon.py 2009-02-14 13:01:57 UTC (rev 11098) @@ -64,10 +64,7 @@ self.unsubscribe_events() def on_status_icon_left_clicked(self, widget): - if len(gajim.events.get_systray_events()) == 0: - self.on_left_click() - else: - self.on_middle_click() + self.on_left_click() def set_img(self): '''apart from image, we also update tooltip text here'''

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2009