Commits

commits@gajim.org

17632 discussions

gajim: re-enable test suite
by Yann Leboulanger 07 Apr '13

07 Apr '13

changeset 35d25e610009 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=35d25e610009 description: re-enable test suite diffstat: test/integration/test_gui_event_integration.py | 14 +- test/integration/test_xmpp_client_nb.py | 169 --------------- test/integration/test_xmpp_transports_nb.py | 276 ------------------------- test/lib/gajim_mocks.py | 18 +- test/lib/notify.py | 19 + test/lib/xmpp_mocks.py | 3 +- test/runtests.py | 15 +- test/unit/test_caps_cache.py | 2 +- test/unit/test_contacts.py | 2 +- test/unit/test_protocol_caps.py | 58 ++-- test/unit/test_sessions.py | 155 +++++++------ test/unit/test_xmpp_dispatcher_nb.py | 97 -------- test/unit/test_xmpp_smacks.py | 133 ------------ test/unit/test_xmpp_transports_nb.py | 78 ------- 14 files changed, 164 insertions(+), 875 deletions(-) diffs (truncated from 1290 to 300 lines): diff -r 4c68e1f6d9ca -r 35d25e610009 test/integration/test_gui_event_integration.py --- a/test/integration/test_gui_event_integration.py Sat Apr 06 12:25:19 2013 +0200 +++ b/test/integration/test_gui_event_integration.py Sun Apr 07 23:41:15 2013 +0200 @@ -6,6 +6,8 @@ import lib lib.setup_env() +import nbxmpp + from common import gajim from common import contacts as contacts_module from gajim import Interface @@ -46,8 +48,16 @@ def contact_comes_online(self, account, jid, resource, prio): '''a remote contact comes online''' - gajim.interface.handle_event_notify(account, (jid, 'online', "I'm back!", - resource, prio, None, time.time(), None)) + xml = """<presence from='%s/%s' id='123'> + <c node='http://gajim.org' ver='pRCD6cgQ4SDqNMCjdhRV6TECx5o=' + hash='sha-1' xmlns='http://jabber.org/protocol/caps'/> + <status>I'm back!</status> + </presence> + """ % (jid, resource) + msg = nbxmpp.protocol.Presence(node=nbxmpp.simplexml.XML2Node(xml)) + gajim.connections[account]._presenceCB(None, msg) +# gajim.interface.handle_event_notify(account, (jid, 'online', "I'm back!", +# resource, prio, None, time.time(), None)) contact = None for c in gajim.contacts.get_contacts(account, jid): diff -r 4c68e1f6d9ca -r 35d25e610009 test/integration/test_xmpp_client_nb.py --- a/test/integration/test_xmpp_client_nb.py Sat Apr 06 12:25:19 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,169 +0,0 @@ -''' -Testing script for NonBlockingClient class (src/common/xmpp/client_nb.py) - -It actually connects to a xmpp server. -''' - -import unittest - -import lib -lib.setup_env() - -from xmpp_mocks import MockConnection, IdleQueueThread -from mock import Mock -from common.xmpp import client_nb - -#import logging -#log = logging.getLogger('gajim') -#log.setLevel(logging.DEBUG) - -# (XMPP server hostname, c2s port). Script will connect to the machine. -xmpp_server_port = ('gajim.org', 5222) - -# [username, password, passphrase]. Script will authenticate to server above -credentials = ['unittest', 'testtest', 'res'] - -class TestNonBlockingClient(unittest.TestCase): - ''' - Test Cases class for NonBlockingClient. - ''' - def setUp(self): - ''' IdleQueue thread is run and dummy connection is created. ''' - self.idlequeue_thread = IdleQueueThread() - self.connection = MockConnection() # for dummy callbacks - self.idlequeue_thread.start() - - def tearDown(self): - ''' IdleQueue thread is stopped. ''' - self.idlequeue_thread.stop_thread() - self.idlequeue_thread.join() - - self.client = None - - def open_stream(self, server_port, wrong_pass=False): - ''' - Method opening the XMPP connection. It returns when <stream:features> - is received from server. - - :param server_port: tuple of (hostname, port) for where the client should - connect. - ''' - - class TempConnection(): - def get_password(self, cb, mechanism): - if wrong_pass: - cb('wrong pass') - else: - cb(credentials[1]) - def on_connect_failure(self): - pass - - self.client = client_nb.NonBlockingClient( - domain=server_port[0], - idlequeue=self.idlequeue_thread.iq, - caller=Mock(realClass=TempConnection)) - - self.client.connect( - hostname=server_port[0], - port=server_port[1], - on_connect=lambda *args: self.connection.on_connect(True, *args), - on_connect_failure=lambda *args: self.connection.on_connect( - False, *args)) - - self.assert_(self.connection.wait(), - msg='waiting for callback from client constructor') - - # if on_connect was called, client has to be connected and vice versa - if self.connection.connect_succeeded: - self.assert_(self.client.get_connect_type()) - else: - self.assert_(not self.client.get_connect_type()) - - def client_auth(self, username, password, resource, sasl): - ''' - Method authenticating connected client with supplied credentials. Returns - when authentication is over. - - :param sasl: whether to use sasl (sasl=1) or old (sasl=0) authentication - :todo: to check and be more specific about when it returns - (bind, session..) - ''' - self.client.auth(username, password, resource, sasl, - on_auth=self.connection.on_auth) - - self.assert_(self.connection.wait(), msg='waiting for authentication') - - def do_disconnect(self): - ''' - Does disconnecting of connected client. Returns when TCP connection is - closed. - ''' - self.client.RegisterDisconnectHandler(self.connection.set_event) - self.client.disconnect() - - self.assertTrue(self.connection.wait(), msg='waiting for disconnecting') - - def test_proper_connect_sasl(self): - ''' - The ideal testcase - client is connected, authenticated with SASL and - then disconnected. - ''' - self.open_stream(xmpp_server_port) - - # if client is not connected, lets raise the AssertionError - self.assert_(self.client.get_connect_type()) - # client.disconnect() is already called from NBClient via - # _on_connected_failure, no need to call it here - - self.client_auth(credentials[0], credentials[1], credentials[2], sasl=1) - self.assert_(self.connection.con) - self.assert_(self.connection.auth=='sasl', msg='Unable to auth via SASL') - - self.do_disconnect() - - def test_proper_connect_oldauth(self): - ''' - The ideal testcase - client is connected, authenticated with old auth and - then disconnected. - ''' - self.open_stream(xmpp_server_port) - self.assert_(self.client.get_connect_type()) - self.client_auth(credentials[0], credentials[1], credentials[2], sasl=0) - self.assert_(self.connection.con) - features = self.client.Dispatcher.Stream.features - if not features.getTag('auth'): - print "Server doesn't support old authentication type, ignoring test" - else: - self.assert_(self.connection.auth=='old_auth', - msg='Unable to auth via old_auth') - self.do_disconnect() - - def test_connect_to_nonexisting_host(self): - ''' - Connect to nonexisting host. DNS request for A records should return - nothing. - ''' - self.open_stream(('fdsfsdf.fdsf.fss', 5222)) - self.assert_(not self.client.get_connect_type()) - - def test_connect_to_wrong_port(self): - ''' - Connect to nonexisting server. DNS request for A records should return an - IP but there shouldn't be XMPP server running on specified port. - ''' - self.open_stream((xmpp_server_port[0], 31337)) - self.assert_(not self.client.get_connect_type()) - - def test_connect_with_wrong_creds(self): - ''' - Connecting with invalid password. - ''' - self.open_stream(xmpp_server_port, wrong_pass=True) - self.assert_(self.client.get_connect_type()) - self.client_auth(credentials[0], 'wrong pass', credentials[2], sasl=1) - self.assert_(self.connection.auth is None) - self.do_disconnect() - - -if __name__ == '__main__': - unittest.main() diff -r 4c68e1f6d9ca -r 35d25e610009 test/integration/test_xmpp_transports_nb.py --- a/test/integration/test_xmpp_transports_nb.py Sat Apr 06 12:25:19 2013 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,276 +0,0 @@ -''' -Integration test for tranports classes. See unit for the ordinary -unit tests of this module. -''' - -import unittest -import socket - -import lib -lib.setup_env() - -from xmpp_mocks import IdleQueueThread, IdleMock -from common.xmpp import transports_nb - - -class AbstractTransportTest(unittest.TestCase): - ''' Encapsulates Idlequeue instantiation for transports and more...''' - - def setUp(self): - ''' IdleQueue thread is run and dummy connection is created. ''' - self.idlequeue_thread = IdleQueueThread() - self.idlequeue_thread.start() - self._setup_hook() - - def tearDown(self): - ''' IdleQueue thread is stopped. ''' - self._teardown_hook() - self.idlequeue_thread.stop_thread() - self.idlequeue_thread.join() - - def _setup_hook(self): - pass - - def _teardown_hook(self): - pass - - def expect_receive(self, expected, count=1, msg=None): - ''' - Returns a callback function that will assert whether the data passed to - it equals the one specified when calling this function. - - Can be used to make sure transport dispatch correct data. - ''' - def receive(data, *args, **kwargs): - self.assertEqual(data, expected, msg=msg) - self._expected_count -= 1 - self._expected_count = count - return receive - - def have_received_expected(self): - ''' - Plays together with expect_receive(). Will return true if expected_rcv - callback was called as often as specified - ''' - return self._expected_count == 0 - - -class TestNonBlockingTCP(AbstractTransportTest): - ''' - Test class for NonBlockingTCP. Will actually try to connect to an existing - XMPP server. - ''' - class MockClient(IdleMock): - ''' Simple client to test transport functionality ''' - def __init__(self, idlequeue, testcase): - self.idlequeue = idlequeue - self.testcase = testcase - IdleMock.__init__(self) - - def do_connect(self, establish_tls=False, proxy_dict=None): - try: - ips = socket.getaddrinfo('gajim.org', 5222, - socket.AF_UNSPEC, socket.SOCK_STREAM) - ip = ips[0] - except socket.error, e: - self.testcase.fail(msg=str(e)) - - self.socket = transports_nb.NonBlockingTCP( - raise_event=lambda event_type, data: self.testcase.assertTrue( - event_type and data), - on_disconnect=lambda: self.on_success(mode='SocketDisconnect'), - idlequeue=self.idlequeue, - estabilish_tls=establish_tls, - certs=('../data/other/cacerts.pem', 'tmp/cacerts.pem'), - proxy_dict=proxy_dict) - - self.socket.PlugIn(self) - - self.socket.connect(conn_5tuple=ip, - on_connect=lambda: self.on_success(mode='TCPconnect'), - on_connect_failure=self.on_failure) - self.testcase.assertTrue(self.wait(), msg='Connection timed out')

1 0

python-nbxmpp: add test suite
by Yann Leboulanger 07 Apr '13

07 Apr '13

changeset c4e5f8d381e0 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=c4e5f8d381e0 description: add test suite diffstat: test/lib/__init__.py | 13 + test/lib/mock.py | 463 ++++++++++++++++++++++++++++++++++ test/lib/xmpp_mocks.py | 95 ++++++ test/runtests.py | 51 +++ test/unit/__init__.py | 5 + test/unit/test_xmpp_client_nb.py | 163 +++++++++++ test/unit/test_xmpp_dispatcher_nb.py | 97 +++++++ test/unit/test_xmpp_smacks.py | 133 +++++++++ test/unit/test_xmpp_transports_nb.py | 78 +++++ test/unit/test_xmpp_transports_nb2.py | 276 ++++++++++++++++++++ 10 files changed, 1374 insertions(+), 0 deletions(-) diffs (truncated from 1414 to 300 lines): diff -r 9046fb3554d1 -r c4e5f8d381e0 test/lib/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/lib/__init__.py Sun Apr 07 22:07:13 2013 +0200 @@ -0,0 +1,13 @@ +import sys +import os +import getopt + +root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '../..') + +# look for modules in the CWD, then gajim/test/lib, then gajim/src, +# then everywhere else +sys.path.insert(1, root) +sys.path.insert(1, root + '/test/lib') + +def setup_env(): + pass diff -r 9046fb3554d1 -r c4e5f8d381e0 test/lib/mock.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/lib/mock.py Sun Apr 07 22:07:13 2013 +0200 @@ -0,0 +1,463 @@ +# +# (c) Dave Kirby 2001 - 2005 +# mock(a)thedeveloperscoach.com +# +# Original call interceptor and call assertion code by Phil Dawes (pdawes(a)users.sourceforge.net) +# Call interceptor code enhanced by Bruce Cropley (cropleyb(a)yahoo.com.au) +# +# This Python module and associated files are released under the FreeBSD +# license. Essentially, you can do what you like with it except pretend you wrote +# it yourself. +# +# +# Copyright (c) 2005, Dave Kirby +# Copyright (c) 2009, Yann Leboulanger +# +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * Neither the name of this library nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# mock(a)thedeveloperscoach.com + + +""" +Mock object library for Python. Mock objects can be used when unit testing +to remove a dependency on another production class. They are typically used +when the dependency would either pull in lots of other classes, or +significantly slow down the execution of the test. +They are also used to create exceptional conditions that cannot otherwise +be easily triggered in the class under test. +""" + +__version__ = "0.1.0" + +# Added in Python 2.1 +import inspect +import re + +class MockInterfaceError(Exception): + pass + +class Mock(object): + """ + The Mock class emulates any other class for testing purposes. + All method calls are stored for later examination. + """ + + def __init__(self, returnValues=None, realClass=None): + """ + The Mock class constructor takes a dictionary of method names and + the values they return. Methods that are not in the returnValues + dictionary will return None. + You may also supply a class whose interface is being mocked. + All calls will be checked to see if they appear in the original + interface. Any calls to methods not appearing in the real class + will raise a MockInterfaceError. Any calls that would fail due to + non-matching parameter lists will also raise a MockInterfaceError. + Both of these help to prevent the Mock class getting out of sync + with the class it is Mocking. + """ + self.mockCalledMethods = {} + self.mockAllCalledMethods = [] + self.mockReturnValues = returnValues or {} + self.mockExpectations = {} + self.realClass = realClass + self.realClassMethods = None + if realClass: + self.realClassMethods = dict(inspect.getmembers(realClass, inspect.isroutine)) + for retMethod in self.mockReturnValues.keys(): + if retMethod not in self.realClassMethods: + raise MockInterfaceError("Return value supplied for method '%s' that was not in the original class" % retMethod) + self._setupSubclassMethodInterceptors() + + def _setupSubclassMethodInterceptors(self): + methods = inspect.getmembers(self.realClass, inspect.isroutine) + baseMethods = dict(inspect.getmembers(Mock, inspect.ismethod)) + for m in methods: + name = m[0] + # Don't record calls to methods of Mock base class. + if not name in baseMethods: + self.__dict__[name] = MockCallable(name, self, handcrafted=True) + + def __getattr__(self, name): + return MockCallable(name, self) + + def mockAddReturnValues(self, **methodReturnValues ): + self.mockReturnValues.update(methodReturnValues) + + def mockSetExpectation(self, name, testFn, after=0, until=0): + self.mockExpectations.setdefault(name, []).append((testFn, after, until)) + + def _checkInterfaceCall(self, name, callParams, callKwParams): + """ + Check that a call to a method of the given name to the original + class with the given parameters would not fail. If it would fail, + raise a MockInterfaceError. + Based on the Python 2.3.3 Reference Manual section 5.3.4: Calls. + """ + if self.realClassMethods is None: + return + if name not in self.realClassMethods: + return + + func = self.realClassMethods[name] + try: + args, varargs, varkw, defaults = inspect.getargspec(func) + except TypeError: + # func is not a Python function. It is probably a builtin, + # such as __repr__ or __coerce__. TODO: Checking? + # For now assume params are OK. + return + + # callParams doesn't include self; args does include self. + numPosCallParams = 1 + len(callParams) + + if numPosCallParams > len(args) and not varargs: + raise MockInterfaceError("Original %s() takes at most %s arguments (%s given)" % + (name, len(args), numPosCallParams)) + + # Get the number of positional arguments that appear in the call, + # also check for duplicate parameters and unknown parameters + numPosSeen = _getNumPosSeenAndCheck(numPosCallParams, callKwParams, args, varkw) + + lenArgsNoDefaults = len(args) - len(defaults or []) + if numPosSeen < lenArgsNoDefaults: + raise MockInterfaceError("Original %s() takes at least %s arguments (%s given)" % (name, lenArgsNoDefaults, numPosSeen)) + + def mockGetAllCalls(self): + """ + Return a list of MockCall objects, + representing all the methods in the order they were called. + """ + return self.mockAllCalledMethods + getAllCalls = mockGetAllCalls # deprecated - kept for backward compatibility + + def mockGetNamedCalls(self, methodName): + """ + Return a list of MockCall objects, + representing all the calls to the named method in the order they were called. + """ + return self.mockCalledMethods.get(methodName, []) + getNamedCalls = mockGetNamedCalls # deprecated - kept for backward compatibility + + def mockCheckCall(self, index, name, *args, **kwargs): + '''test that the index-th call had the specified name and parameters''' + call = self.mockAllCalledMethods[index] + assert name == call.getName(), "%r != %r" % (name, call.getName()) + call.checkArgs(*args, **kwargs) + + +def _getNumPosSeenAndCheck(numPosCallParams, callKwParams, args, varkw): + """ + Positional arguments can appear as call parameters either named as + a named (keyword) parameter, or just as a value to be matched by + position. Count the positional arguments that are given by either + keyword or position, and check for duplicate specifications. + Also check for arguments specified by keyword that do not appear + in the method's parameter list. + """ + posSeen = {} + for arg in args[:numPosCallParams]: + posSeen[arg] = True + for kwp in callKwParams: + if kwp in posSeen: + raise MockInterfaceError("%s appears as both a positional and named parameter." % kwp) + if kwp in args: + posSeen[kwp] = True + elif not varkw: + raise MockInterfaceError("Original method does not have a parameter '%s'" % kwp) + return len(posSeen) + +class MockCall: + """ + MockCall records the name and parameters of a call to an instance + of a Mock class. Instances of MockCall are created by the Mock class, + but can be inspected later as part of the test. + """ + def __init__(self, name, params, kwparams ): + self.name = name + self.params = params + self.kwparams = kwparams + + def checkArgs(self, *args, **kwargs): + assert args == self.params, "%r != %r" % (args, self.params) + assert kwargs == self.kwparams, "%r != %r" % (kwargs, self.kwparams) + + def getParam( self, n ): + if isinstance(n, int): + return self.params[n] + elif isinstance(n, str): + return self.kwparams[n] + else: + raise IndexError, 'illegal index type for getParam' + + def getNumParams(self): + return len(self.params) + + def getNumKwParams(self): + return len(self.kwparams) + + def getName(self): + return self.name + + #pretty-print the method call + def __str__(self): + s = self.name + "(" + sep = '' + for p in self.params: + s = s + sep + repr(p) + sep = ', ' + items = sorted(self.kwparams.items()) + for k, v in items: + s = s + sep + k + '=' + repr(v) + sep = ', ' + s = s + ')' + return s + def __repr__(self): + return self.__str__() + +class MockCallable: + """ + Intercepts the call and records it, then delegates to either the mock's + dictionary of mock return values that was passed in to the constructor, + or a handcrafted method of a Mock subclass. + """ + def __init__(self, name, mock, handcrafted=False): + self.name = name + self.mock = mock + self.handcrafted = handcrafted + + def __call__(self, *params, **kwparams): + self.mock._checkInterfaceCall(self.name, params, kwparams) + thisCall = self.recordCall(params, kwparams) + self.checkExpectations(thisCall, params, kwparams) + return self.makeCall(params, kwparams) + + def recordCall(self, params, kwparams): + """ + Record the MockCall in an ordered list of all calls, and an ordered + list of calls for that method name. + """ + thisCall = MockCall(self.name, params, kwparams) + calls = self.mock.mockCalledMethods.setdefault(self.name, []) + calls.append(thisCall) + self.mock.mockAllCalledMethods.append(thisCall) + return thisCall + + def makeCall(self, params, kwparams): + if self.handcrafted: + allPosParams = (self.mock,) + params + func = _findFunc(self.mock.realClass, self.name) + if not func: + raise NotImplementedError + return func(*allPosParams, **kwparams) + else: + returnVal = self.mock.mockReturnValues.get(self.name) + if isinstance(returnVal, ReturnValuesBase):

1 0

gajim: move gtk function from pep to gui_interface
by Yann Leboulanger 06 Apr '13

06 Apr '13

changeset 4c68e1f6d9ca in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4c68e1f6d9ca description: move gtk function from pep to gui_interface diffstat: src/common/pep.py | 32 ++++---------------------------- src/gui_interface.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 28 deletions(-) diffs (125 lines): diff -r c2e195470071 -r 4c68e1f6d9ca src/common/pep.py --- a/src/common/pep.py Sat Apr 06 12:24:26 2013 +0200 +++ b/src/common/pep.py Sat Apr 06 12:25:19 2013 +0200 @@ -216,8 +216,6 @@ 'uri': _('uri')} import gobject -import gtk - import logging log = logging.getLogger('gajim.c.pep') @@ -225,8 +223,6 @@ import nbxmpp from common import gajim -import gtkgui_helpers - class AbstractPEP(object): @@ -302,10 +298,7 @@ def asPixbufIcon(self): assert not self._retracted - received_mood = self._pep_specific_data['mood'] - mood = received_mood if received_mood in MOODS else 'unknown' - pixbuf = gtkgui_helpers.load_mood_icon(mood).get_pixbuf() - return pixbuf + return gajim.interface.get_pep_icon(self) def asMarkupText(self): assert not self._retracted @@ -347,9 +340,7 @@ return (tune_dict, retracted) def asPixbufIcon(self): - import os - path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png') - return gtk.gdk.pixbuf_new_from_file(path) + return gajim.interface.get_pep_icon(self) def asMarkupText(self): assert not self._retracted @@ -398,21 +389,7 @@ def asPixbufIcon(self): assert not self._retracted - pep = self._pep_specific_data - activity = pep['activity'] - - has_known_activity = activity in ACTIVITIES - has_known_subactivity = (has_known_activity and ('subactivity' in pep) - and (pep['subactivity'] in ACTIVITIES[activity])) - - if has_known_activity: - if has_known_subactivity: - subactivity = pep['subactivity'] - return gtkgui_helpers.load_activity_icon(activity, subactivity).get_pixbuf() - else: - return gtkgui_helpers.load_activity_icon(activity).get_pixbuf() - else: - return gtkgui_helpers.load_activity_icon('unknown').get_pixbuf() + return gajim.interface.get_pep_icon(self) def asMarkupText(self): assert not self._retracted @@ -492,8 +469,7 @@ self._pep_specific_data def asPixbufIcon(self): - path = gtkgui_helpers.get_icon_path('gajim-earth') - return gtk.gdk.pixbuf_new_from_file(path) + return gajim.interface.get_pep_icon(self) def asMarkupText(self): assert not self._retracted diff -r c2e195470071 -r 4c68e1f6d9ca src/gui_interface.py --- a/src/gui_interface.py Sat Apr 06 12:24:26 2013 +0200 +++ b/src/gui_interface.py Sat Apr 06 12:25:19 2013 +0200 @@ -85,6 +85,7 @@ from common.connection import Connection from common import jingle from common.file_props import FilesProp +from common import pep import roster_window import profile_window @@ -2603,6 +2604,36 @@ return gc_ctrl and gc_ctrl.type_id == message_control.TYPE_GC + def get_pep_icon(self, pep_obj): + if isinstance(pep_obj, pep.UserMoodPEP): + received_mood = pep_obj._pep_specific_data['mood'] + mood = received_mood if received_mood in pep.MOODS else 'unknown' + return gtkgui_helpers.load_mood_icon(mood).get_pixbuf() + elif isinstance(pep_obj, pep.UserTunePEP): + path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png') + return gtk.gdk.pixbuf_new_from_file(path) + elif isinstance(pep_obj, pep.UserActivityPEP): + pep_ = pep_obj._pep_specific_data + activity = pep_['activity'] + + has_known_activity = activity in pep.ACTIVITIES + has_known_subactivity = (has_known_activity and ('subactivity' in + pep_) and (pep_['subactivity'] in pep.ACTIVITIES[activity])) + + if has_known_activity: + if has_known_subactivity: + subactivity = pep_['subactivity'] + return gtkgui_helpers.load_activity_icon(activity, + subactivity).get_pixbuf() + else: + return gtkgui_helpers.load_activity_icon(activity).\ + get_pixbuf() + else: + return gtkgui_helpers.load_activity_icon('unknown').get_pixbuf() + elif isinstance(pep_obj, pep.UserLocationPEP): + path = gtkgui_helpers.get_icon_path('gajim-earth') + return gtk.gdk.pixbuf_new_from_file(path) + def create_ipython_window(self): try: from ipython_view import IPythonView

1 0

gajim: remove unused class parameter
by Yann Leboulanger 06 Apr '13

06 Apr '13

changeset c2e195470071 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c2e195470071 description: remove unused class parameter diffstat: src/common/connection_handlers.py | 2 +- src/common/protocol/caps.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diffs (26 lines): diff -r d9b0db7645cd -r c2e195470071 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Apr 06 10:14:28 2013 +0200 +++ b/src/common/connection_handlers.py Sat Apr 06 12:24:26 2013 +0200 @@ -1421,7 +1421,7 @@ gajim.nec.register_incoming_event(PresenceReceivedEvent) ConnectionCaps.__init__(self, account=self.name, - dispatch_event=self.dispatch, capscache=capscache.capscache, + capscache=capscache.capscache, client_caps_factory=capscache.create_suitable_client_caps) ConnectionJingle.__init__(self) ConnectionHandlersBase.__init__(self) diff -r d9b0db7645cd -r c2e195470071 src/common/protocol/caps.py --- a/src/common/protocol/caps.py Sat Apr 06 10:14:28 2013 +0200 +++ b/src/common/protocol/caps.py Sat Apr 06 12:24:26 2013 +0200 @@ -34,9 +34,8 @@ class ConnectionCaps(object): - def __init__(self, account, dispatch_event, capscache, client_caps_factory): + def __init__(self, account, capscache, client_caps_factory): self._account = account - self._dispatch_event = dispatch_event self._capscache = capscache self._create_suitable_client_caps = client_caps_factory gajim.nec.register_incoming_event(CapsPresenceReceivedEvent)

1 0

gajim: move ConnectionPEP class to connection_handlers to preven...
by Yann Leboulanger 06 Apr '13

06 Apr '13

changeset d9b0db7645cd in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d9b0db7645cd description: move ConnectionPEP class to connection_handlers to prevent import loop diffstat: src/common/connection_handlers.py | 167 +++++++++++++++++++- src/common/pep.py | 169 +------------------- src/common/zeroconf/connection_handlers_zeroconf.py | 6 +- 3 files changed, 170 insertions(+), 172 deletions(-) diffs (truncated from 384 to 300 lines): diff -r ee6b8e032b5d -r d9b0db7645cd src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Apr 05 21:35:39 2013 +0200 +++ b/src/common/connection_handlers.py Sat Apr 06 10:14:28 2013 +0200 @@ -48,7 +48,6 @@ from common import jingle_xtls from common.commands import ConnectionCommands from common.pubsub import ConnectionPubSub -from common.pep import ConnectionPEP from common.protocol.caps import ConnectionCaps from common.protocol.bytestream import ConnectionSocks5Bytestream from common.protocol.bytestream import ConnectionIBBytestream @@ -767,6 +766,172 @@ p = self.add_sha(p) self.connection.send(p) + +class ConnectionPEP(object): + + def __init__(self, account, dispatcher, pubsub_connection): + self._account = account + self._dispatcher = dispatcher + self._pubsub_connection = pubsub_connection + self.reset_awaiting_pep() + + def pep_change_account_name(self, new_name): + self._account = new_name + + def reset_awaiting_pep(self): + self.to_be_sent_activity = None + self.to_be_sent_mood = None + self.to_be_sent_tune = None + self.to_be_sent_nick = None + self.to_be_sent_location = None + + def send_awaiting_pep(self): + """ + Send pep info that were waiting for connection + """ + if self.to_be_sent_activity: + self.send_activity(*self.to_be_sent_activity) + if self.to_be_sent_mood: + self.send_mood(*self.to_be_sent_mood) + if self.to_be_sent_tune: + self.send_tune(*self.to_be_sent_tune) + if self.to_be_sent_nick: + self.send_nick(self.to_be_sent_nick) + if self.to_be_sent_location: + self.send_location(self.to_be_sent_location) + self.reset_awaiting_pep() + + def _pubsubEventCB(self, xmpp_dispatcher, msg): + ''' Called when we receive <message /> with pubsub event. ''' + gajim.nec.push_incoming_event(PEPReceivedEvent(None, conn=self, + stanza=msg)) + + def send_activity(self, activity, subactivity=None, message=None): + if self.connected == 1: + # We are connecting, keep activity in mem and send it when we'll be + # connected + self.to_be_sent_activity = (activity, subactivity, message) + return + if not self.pep_supported: + return + item = nbxmpp.Node('activity', {'xmlns': nbxmpp.NS_ACTIVITY}) + if activity: + i = item.addChild(activity) + if subactivity: + i.addChild(subactivity) + if message: + i = item.addChild('text') + i.addData(message) + self._pubsub_connection.send_pb_publish('', nbxmpp.NS_ACTIVITY, item, + '0') + + def retract_activity(self): + if not self.pep_supported: + return + self.send_activity(None) + # not all client support new XEP, so we still retract + self._pubsub_connection.send_pb_retract('', nbxmpp.NS_ACTIVITY, '0') + + def send_mood(self, mood, message=None): + if self.connected == 1: + # We are connecting, keep mood in mem and send it when we'll be + # connected + self.to_be_sent_mood = (mood, message) + return + if not self.pep_supported: + return + item = nbxmpp.Node('mood', {'xmlns': nbxmpp.NS_MOOD}) + if mood: + item.addChild(mood) + if message: + i = item.addChild('text') + i.addData(message) + self._pubsub_connection.send_pb_publish('', nbxmpp.NS_MOOD, item, '0') + + def retract_mood(self): + if not self.pep_supported: + return + self.send_mood(None) + # not all client support new XEP, so we still retract + self._pubsub_connection.send_pb_retract('', nbxmpp.NS_MOOD, '0') + + def send_tune(self, artist='', title='', source='', track=0, length=0, + items=None): + if self.connected == 1: + # We are connecting, keep tune in mem and send it when we'll be + # connected + self.to_be_sent_tune = (artist, title, source, track, length, items) + return + if not self.pep_supported: + return + item = nbxmpp.Node('tune', {'xmlns': nbxmpp.NS_TUNE}) + if artist: + i = item.addChild('artist') + i.addData(artist) + if title: + i = item.addChild('title') + i.addData(title) + if source: + i = item.addChild('source') + i.addData(source) + if track: + i = item.addChild('track') + i.addData(track) + if length: + i = item.addChild('length') + i.addData(length) + if items: + item.addChild(payload=items) + self._pubsub_connection.send_pb_publish('', nbxmpp.NS_TUNE, item, '0') + + def retract_tune(self): + if not self.pep_supported: + return + self.send_tune(None) + # not all client support new XEP, so we still retract + self._pubsub_connection.send_pb_retract('', nbxmpp.NS_TUNE, '0') + + def send_nickname(self, nick): + if self.connected == 1: + # We are connecting, keep nick in mem and send it when we'll be + # connected + self.to_be_sent_nick = nick + return + if not self.pep_supported: + return + item = nbxmpp.Node('nick', {'xmlns': nbxmpp.NS_NICK}) + item.addData(nick) + self._pubsub_connection.send_pb_publish('', nbxmpp.NS_NICK, item, '0') + + def retract_nickname(self): + if not self.pep_supported: + return + self.send_nickname(None) + # not all client support new XEP, so we still retract + self._pubsub_connection.send_pb_retract('', nbxmpp.NS_NICK, '0') + + def send_location(self, info): + if self.connected == 1: + # We are connecting, keep location in mem and send it when we'll be + # connected + self.to_be_sent_location = info + return + if not self.pep_supported: + return + item = nbxmpp.Node('geoloc', {'xmlns': nbxmpp.NS_LOCATION}) + for field in LOCATION_DATA: + if info.get(field, None): + i = item.addChild(field) + i.addData(info[field]) + self._pubsub_connection.send_pb_publish('', nbxmpp.NS_LOCATION, item, '0') + + def retract_location(self): + if not self.pep_supported: + return + self.send_location({}) + # not all client support new XEP, so we still retract + self._pubsub_connection.send_pb_retract('', nbxmpp.NS_LOCATION, '0') + # basic connection handlers used here and in zeroconf class ConnectionHandlersBase: def __init__(self): diff -r ee6b8e032b5d -r d9b0db7645cd src/common/pep.py --- a/src/common/pep.py Fri Apr 05 21:35:39 2013 +0200 +++ b/src/common/pep.py Sat Apr 06 10:14:28 2013 +0200 @@ -512,171 +512,4 @@ SUPPORTED_PERSONAL_USER_EVENTS = [UserMoodPEP, UserTunePEP, UserActivityPEP, - UserNicknamePEP, UserLocationPEP] - -from common.connection_handlers_events import PEPReceivedEvent - -class ConnectionPEP(object): - - def __init__(self, account, dispatcher, pubsub_connection): - self._account = account - self._dispatcher = dispatcher - self._pubsub_connection = pubsub_connection - self.reset_awaiting_pep() - - def pep_change_account_name(self, new_name): - self._account = new_name - - def reset_awaiting_pep(self): - self.to_be_sent_activity = None - self.to_be_sent_mood = None - self.to_be_sent_tune = None - self.to_be_sent_nick = None - self.to_be_sent_location = None - - def send_awaiting_pep(self): - """ - Send pep info that were waiting for connection - """ - if self.to_be_sent_activity: - self.send_activity(*self.to_be_sent_activity) - if self.to_be_sent_mood: - self.send_mood(*self.to_be_sent_mood) - if self.to_be_sent_tune: - self.send_tune(*self.to_be_sent_tune) - if self.to_be_sent_nick: - self.send_nick(self.to_be_sent_nick) - if self.to_be_sent_location: - self.send_location(self.to_be_sent_location) - self.reset_awaiting_pep() - - def _pubsubEventCB(self, xmpp_dispatcher, msg): - ''' Called when we receive <message /> with pubsub event. ''' - gajim.nec.push_incoming_event(PEPReceivedEvent(None, conn=self, - stanza=msg)) - - def send_activity(self, activity, subactivity=None, message=None): - if self.connected == 1: - # We are connecting, keep activity in mem and send it when we'll be - # connected - self.to_be_sent_activity = (activity, subactivity, message) - return - if not self.pep_supported: - return - item = nbxmpp.Node('activity', {'xmlns': nbxmpp.NS_ACTIVITY}) - if activity: - i = item.addChild(activity) - if subactivity: - i.addChild(subactivity) - if message: - i = item.addChild('text') - i.addData(message) - self._pubsub_connection.send_pb_publish('', nbxmpp.NS_ACTIVITY, item, - '0') - - def retract_activity(self): - if not self.pep_supported: - return - self.send_activity(None) - # not all client support new XEP, so we still retract - self._pubsub_connection.send_pb_retract('', nbxmpp.NS_ACTIVITY, '0') - - def send_mood(self, mood, message=None): - if self.connected == 1: - # We are connecting, keep mood in mem and send it when we'll be - # connected - self.to_be_sent_mood = (mood, message) - return - if not self.pep_supported: - return - item = nbxmpp.Node('mood', {'xmlns': nbxmpp.NS_MOOD}) - if mood: - item.addChild(mood) - if message: - i = item.addChild('text') - i.addData(message) - self._pubsub_connection.send_pb_publish('', nbxmpp.NS_MOOD, item, '0') - - def retract_mood(self): - if not self.pep_supported: - return - self.send_mood(None) - # not all client support new XEP, so we still retract - self._pubsub_connection.send_pb_retract('', nbxmpp.NS_MOOD, '0') - - def send_tune(self, artist='', title='', source='', track=0, length=0, - items=None): - if self.connected == 1: - # We are connecting, keep tune in mem and send it when we'll be - # connected - self.to_be_sent_tune = (artist, title, source, track, length, items) - return - if not self.pep_supported: - return - item = nbxmpp.Node('tune', {'xmlns': nbxmpp.NS_TUNE}) - if artist: - i = item.addChild('artist') - i.addData(artist) - if title: - i = item.addChild('title') - i.addData(title) - if source:

1 0

gajim: update my copyright
by Yann Leboulanger 05 Apr '13

05 Apr '13

changeset ee6b8e032b5d in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ee6b8e032b5d description: update my copyright diffstat: setup_win32.py | 2 +- src/adhoc_commands.py | 2 +- src/advanced_configuration_window.py | 2 +- src/atom_window.py | 2 +- src/cell_renderer_image.py | 2 +- src/chat_control.py | 2 +- src/common/atom.py | 2 +- src/common/caps_cache.py | 2 +- src/common/check_paths.py | 2 +- src/common/commands.py | 2 +- src/common/config.py | 2 +- src/common/configpaths.py | 2 +- src/common/connection.py | 2 +- src/common/connection_handlers.py | 2 +- src/common/connection_handlers_events.py | 2 +- src/common/contacts.py | 2 +- src/common/dataforms.py | 2 +- src/common/dbus_support.py | 2 +- src/common/defs.py | 2 +- src/common/dh.py | 2 +- src/common/events.py | 2 +- src/common/exceptions.py | 2 +- src/common/fuzzyclock.py | 2 +- src/common/gajim.py | 2 +- src/common/gpg.py | 2 +- src/common/helpers.py | 2 +- src/common/i18n.py | 2 +- src/common/location_listener.py | 2 +- src/common/logger.py | 2 +- src/common/optparser.py | 2 +- src/common/passwords.py | 2 +- src/common/pep.py | 2 +- src/common/protocol/bytestream.py | 2 +- src/common/proxy65_manager.py | 2 +- src/common/pubsub.py | 2 +- src/common/rst_xhtml_generator.py | 2 +- src/common/sleepy.py | 2 +- src/common/socks5.py | 2 +- src/common/stanza_session.py | 2 +- src/common/zeroconf/connection_zeroconf.py | 2 +- src/config.py | 2 +- src/conversation_textview.py | 2 +- src/dataforms_widget.py | 2 +- src/dialogs.py | 2 +- src/disco.py | 2 +- src/features_window.py | 2 +- src/filetransfers_window.py | 2 +- src/gajim-remote.py | 2 +- src/gajim.py | 2 +- src/gajim_themes_window.py | 2 +- src/groupchat_control.py | 2 +- src/groups.py | 2 +- src/gtkexcepthook.py | 2 +- src/gtkgui_helpers.py | 2 +- src/gui_interface.py | 2 +- src/gui_menu_builder.py | 2 +- src/history_manager.py | 2 +- src/history_window.py | 2 +- src/htmltextview.py | 2 +- src/ipython_view.py | 2 +- src/message_control.py | 2 +- src/message_textview.py | 2 +- src/message_window.py | 2 +- src/music_track_listener.py | 2 +- src/negotiation.py | 2 +- src/network_manager_listener.py | 2 +- src/notify.py | 2 +- src/profile_window.py | 2 +- src/remote_control.py | 2 +- src/roster_window.py | 2 +- src/search_window.py | 2 +- src/session.py | 2 +- src/statusicon.py | 2 +- src/tooltips.py | 2 +- src/upower_listener.py | 2 +- src/vcard.py | 2 +- 76 files changed, 76 insertions(+), 76 deletions(-) diffs (truncated from 909 to 300 lines): diff -r 3eb76c6b014a -r ee6b8e032b5d setup_win32.py --- a/setup_win32.py Fri Apr 05 20:59:47 2013 +0200 +++ b/setup_win32.py Fri Apr 05 21:35:39 2013 +0200 @@ -1,6 +1,6 @@ ## setup_win32.py (run me as python setup_win32.py py2exe -O2) ## -## Copyright (C) 2003-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## diff -r 3eb76c6b014a -r ee6b8e032b5d src/adhoc_commands.py --- a/src/adhoc_commands.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/adhoc_commands.py Fri Apr 05 21:35:39 2013 +0200 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2006 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## Stephan Erb <steve-e AT h3c.de> ## diff -r 3eb76c6b014a -r ee6b8e032b5d src/advanced_configuration_window.py --- a/src/advanced_configuration_window.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/advanced_configuration_window.py Fri Apr 05 21:35:39 2013 +0200 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2005 Travis Shirk <travis AT pobox.com> ## Vincent Hanquez <tab AT snarc.org> -## Copyright (C) 2005-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2006-2007 Jean-Marie Traissard <jim AT lapin.org> diff -r 3eb76c6b014a -r ee6b8e032b5d src/atom_window.py --- a/src/atom_window.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/atom_window.py Fri Apr 05 21:35:39 2013 +0200 @@ -2,7 +2,7 @@ ## src/atom_window.py ## ## Copyright (C) 2006 Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## diff -r 3eb76c6b014a -r ee6b8e032b5d src/cell_renderer_image.py --- a/src/cell_renderer_image.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/cell_renderer_image.py Fri Apr 05 21:35:39 2013 +0200 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/cell_renderer_image.py ## -## Copyright (C) 2003-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2006 Travis Shirk <travis AT pobox.com> diff -r 3eb76c6b014a -r ee6b8e032b5d src/chat_control.py --- a/src/chat_control.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/chat_control.py Fri Apr 05 21:35:39 2013 +0200 @@ -2,7 +2,7 @@ ## src/chat_control.py ## ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -## Copyright (C) 2006-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Nikos Kouremenos <kourem AT gmail.com> ## Travis Shirk <travis AT pobox.com> diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/atom.py --- a/src/common/atom.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/atom.py Fri Apr 05 21:35:39 2013 +0200 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> ## ## This file is part of Gajim. ## diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/caps_cache.py --- a/src/common/caps_cache.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/caps_cache.py Fri Apr 05 21:35:39 2013 +0200 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> ## Travis Shirk <travis AT pobox.com> -## Copyright (C) 2007-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> ## Jonathan Schleifer <js-gajim AT webkeks.org> ## Copyright (C) 2008-2009 Stephan Erb <steve-e AT h3c.de> diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/check_paths.py --- a/src/common/check_paths.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/check_paths.py Fri Apr 05 21:35:39 2013 +0200 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2005-2006 Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2005-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> ## Copyright (C) 2008 Jean-Marie Traissard <jim AT lapin.org> diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/commands.py --- a/src/common/commands.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/commands.py Fri Apr 05 21:35:39 2013 +0200 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/commands.py ## -## Copyright (C) 2006-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/config.py --- a/src/common/config.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/config.py Fri Apr 05 21:35:39 2013 +0200 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/config.py ## -## Copyright (C) 2003-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2004-2005 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2005 Stéphan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/configpaths.py --- a/src/common/configpaths.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/configpaths.py Fri Apr 05 21:35:39 2013 +0200 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Junglecow J <junglecow AT gmail.com> -## Copyright (C) 2006-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Brendan Taylor <whateley AT gmail.com> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> ## diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/connection.py --- a/src/common/connection.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/connection.py Fri Apr 05 21:35:39 2013 +0200 @@ -2,7 +2,7 @@ ## src/common/connection.py ## ## Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> -## Copyright (C) 2003-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> ## Stéphan Kochen <stephan AT kochen.nl> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/connection_handlers.py --- a/src/common/connection_handlers.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/connection_handlers.py Fri Apr 05 21:35:39 2013 +0200 @@ -6,7 +6,7 @@ ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> ## Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> ## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> ## Jean-Marie Traissard <jim AT lapin.org> diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/connection_handlers_events.py Fri Apr 05 21:35:39 2013 +0200 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/connection_handlers_events.py ## -## Copyright (C) 2010-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2010-2013 Yann Leboulanger <asterix AT lagaule.org> ## ## This file is part of Gajim. ## diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/contacts.py --- a/src/common/contacts.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/contacts.py Fri Apr 05 21:35:39 2013 +0200 @@ -4,7 +4,7 @@ ## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> ## Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> ## Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Lukas Petrovicky <lukas AT petrovicky.net> ## Tomasz Melcer <liori AT exroot.org> diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/dataforms.py --- a/src/common/dataforms.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/dataforms.py Fri Apr 05 21:35:39 2013 +0200 @@ -3,7 +3,7 @@ ## src/common/dataforms.py ## ## Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> -## Copyright (C) 2006-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> ## ## This file is part of Gajim. diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/dbus_support.py --- a/src/common/dbus_support.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/dbus_support.py Fri Apr 05 21:35:39 2013 +0200 @@ -4,7 +4,7 @@ ## Copyright (C) 2005 Andrew Sayman <lorien420 AT myrealbox.com> ## Dimitur Kirov <dkirov AT gmail.com> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2005-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Stefan Bethge <stefan AT lanpartei.de> ## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/defs.py --- a/src/common/defs.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/defs.py Fri Apr 05 21:35:39 2013 +0200 @@ -2,7 +2,7 @@ ## src/common/defs.py ## ## Copyright (C) 2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Brendan Taylor <whateley AT gmail.com> ## Tomasz Melcer <liori AT exroot.org> diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/dh.py --- a/src/common/dh.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/dh.py Fri Apr 05 21:35:39 2013 +0200 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/dh.py ## -## Copyright (C) 2007-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2007-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> ## ## This file is part of Gajim. diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/events.py --- a/src/common/events.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/events.py Fri Apr 05 21:35:39 2013 +0200 @@ -3,7 +3,7 @@ ## ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2006-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> ## Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> ## Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/exceptions.py --- a/src/common/exceptions.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/exceptions.py Fri Apr 05 21:35:39 2013 +0200 @@ -2,7 +2,7 @@ ## src/common/exceptions.py ## ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> -## Copyright (C) 2005-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2005-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2006 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2007 Brendan Taylor <whateley AT gmail.com> ## diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/fuzzyclock.py --- a/src/common/fuzzyclock.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/fuzzyclock.py Fri Apr 05 21:35:39 2013 +0200 @@ -2,7 +2,7 @@ ## src/common/fuzzyclock.py ## ## Copyright (C) 2006 Christoph Neuroth <delmonico AT gmx.net> -## Copyright (C) 2006-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2007 Jean-Marie Traissard <jim AT lapin.org> ## Copyright (C) 2009 Benjamin Richter <br AT waldteufel-online.net> ## diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/gajim.py --- a/src/common/gajim.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/gajim.py Fri Apr 05 21:35:39 2013 +0200 @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- ## src/common/gajim.py ## -## Copyright (C) 2003-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> ## Travis Shirk <travis AT pobox.com> ## Nikos Kouremenos <kourem AT gmail.com> diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/gpg.py --- a/src/common/gpg.py Fri Apr 05 20:59:47 2013 +0200 +++ b/src/common/gpg.py Fri Apr 05 21:35:39 2013 +0200 @@ -1,6 +1,6 @@ ## src/common/gpg.py ## -## Copyright (C) 2003-2012 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2003-2013 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> ## Copyright (C) 2007 Stephan Erb <steve-e AT h3c.de> diff -r 3eb76c6b014a -r ee6b8e032b5d src/common/helpers.py --- a/src/common/helpers.py Fri Apr 05 20:59:47 2013 +0200

1 0

gajim: enable block menu if server supports only XEP-0191
by Yann Leboulanger 05 Apr '13

05 Apr '13

changeset 3eb76c6b014a in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3eb76c6b014a description: enable block menu if server supports only XEP-0191 diffstat: src/gui_menu_builder.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 18f680a9b3dc -r 3eb76c6b014a src/gui_menu_builder.py --- a/src/gui_menu_builder.py Fri Apr 05 20:59:17 2013 +0200 +++ b/src/gui_menu_builder.py Fri Apr 05 20:59:47 2013 +0200 @@ -468,8 +468,8 @@ execute_command_menuitem, send_custom_status_menuitem): widget.set_sensitive(False) - if gajim.connections[account] and gajim.connections[account].\ - privacy_rules_supported: + if gajim.connections[account] and (gajim.connections[account].\ + privacy_rules_supported or gajim.connections[account].blocking_supported): if helpers.jid_is_blocked(account, jid): block_menuitem.set_no_show_all(True) block_menuitem.hide()

1 0

gajim: don't run several GPG threads when we receive a non-GPG m...
by Yann Leboulanger 05 Apr '13

05 Apr '13

changeset 18f680a9b3dc in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=18f680a9b3dc description: don't run several GPG threads when we receive a non-GPG message. Fixes #7311 diffstat: src/common/connection_handlers.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 79cfe7aea41c -r 18f680a9b3dc src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Mar 31 15:59:36 2013 +0200 +++ b/src/common/connection_handlers.py Fri Apr 05 20:59:17 2013 +0200 @@ -1015,7 +1015,8 @@ gajim.thread_interface(self.decrypt_thread, [encmsg, keyID, obj], self._on_message_decrypted, [obj]) return - self._on_message_decrypted(None, obj) + gajim.nec.push_incoming_event(DecryptedMessageReceivedEvent(None, + conn=self, msg_obj=obj)) def _on_message_decrypted(self, output, obj): if len(self.gpg_messages_to_decrypt):

1 0

python-nbxmpp: add XEP-191 namespace
by Yann Leboulanger 02 Apr '13

02 Apr '13

changeset 9046fb3554d1 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=9046fb3554d1 description: add XEP-191 namespace diffstat: nbxmpp/protocol.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 77e213c484cd -r 9046fb3554d1 nbxmpp/protocol.py --- a/nbxmpp/protocol.py Sat Feb 23 11:42:07 2013 -0400 +++ b/nbxmpp/protocol.py Sat Mar 30 20:53:42 2013 +0100 @@ -45,6 +45,7 @@ NS_AUTH = 'jabber:iq:auth' NS_AVATAR = 'http://www.xmpp.org/extensions/xep-0084.html#ns-metadata' NS_BIND = 'urn:ietf:params:xml:ns:xmpp-bind' +NS_BLOCKING = 'urn:xmpp:blocking' # XEP-0191 NS_BOB = 'urn:xmpp:bob' # XEP-0231 NS_BOOKMARKS = 'storage:bookmarks' # XEP-0048 NS_BROWSE = 'jabber:iq:browse'

1 0

gajim: update Changelog for next release
by Yann Leboulanger 31 Mar '13

31 Mar '13

changeset 79cfe7aea41c in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=79cfe7aea41c description: update Changelog for next release diffstat: ChangeLog | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diffs (18 lines): diff -r 7e68b94754c0 -r 79cfe7aea41c ChangeLog --- a/ChangeLog Sun Mar 31 15:17:10 2013 +0200 +++ b/ChangeLog Sun Mar 31 15:59:36 2013 +0200 @@ -1,4 +1,14 @@ +Gajim 0.16 () + + * Improve File transfer support by adding Jingle file transfer + * use external python-nbxmpp library + * Improve audio / Video calls and add screensharing feature + * Support systemd-logind + * Support XEP-0224 (Attention) + * Support XEP-0191 blocking command + Gajim 0.15.3 (17 March 2013) + * Better handling of SSL errors * Better handling of canceling file transfer * Improve farstream calls

1 0

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