Commits January 2009

commits@gajim.org

7 participants
115 discussions

[commit-gajim] r10967 - in trunk/test: . lib
by steve-e＠gajim.org 11 Jan '09

11 Jan '09

Author: steve-e Date: 2009-01-11 14:49:03 +0100 (Sun, 11 Jan 2009) New Revision: 10967 Added: trunk/test/lib/gajim_mocks.py trunk/test/lib/xmpp_mocks.py trunk/test/test_xmpp_client_nb.py trunk/test/test_xmpp_dispatcher_nb.py trunk/test/test_xmpp_transports_nb.py Removed: trunk/test/lib/mocks.py trunk/test/test_client_nb.py trunk/test/test_dispatcher_nb.py trunk/test/test_nonblockingtcp.py trunk/test/xmpp_mocks.py Modified: trunk/test/lib/__init__.py trunk/test/lib/data.py trunk/test/runtests.py trunk/test/test_caps.py trunk/test/test_misc_interface.py trunk/test/test_resolver.py trunk/test/test_roster.py trunk/test/test_sessions.py Log: Improve code coverage of our testsuites and do some refactoring. * resolver does not depend on GTK anymore * renamed a few modules for consistency * moved all mocks to lib/ * let client_nb test work again. Was broken here There are many failing tests, help appreciated :-) Modified: trunk/test/lib/__init__.py =================================================================== --- trunk/test/lib/__init__.py 2009-01-11 13:42:39 UTC (rev 10966) +++ trunk/test/lib/__init__.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -1,5 +1,5 @@ import sys -import os.path +import os import getopt use_x = True @@ -12,7 +12,8 @@ gajim_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 +# look for modules in the CWD, then gajim/test/lib, then gajim/src, +# then everywhere else sys.path.insert(1, gajim_root + '/src') sys.path.insert(1, gajim_root + '/test/lib') @@ -23,8 +24,6 @@ import __builtin__ __builtin__._ = lambda x: x -import os - def setup_env(): # wipe config directory if os.path.isdir(configdir): @@ -40,6 +39,9 @@ # for some reason common.gajim needs to be imported before xmpppy? from common import gajim + import logging + logging.basicConfig() + gajim.DATA_DIR = gajim_root + '/data' gajim.use_x = use_x Modified: trunk/test/lib/data.py =================================================================== --- trunk/test/lib/data.py 2009-01-11 13:42:39 UTC (rev 10966) +++ trunk/test/lib/data.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -52,6 +52,7 @@ # 'ask': None, 'groups': [], 'name': None, # 'resources': {}, 'subscription': u'both'} } + # We have contacts that are not in roster but only specified in the metadata metacontact_data = [ [{'account': account3, @@ -75,3 +76,4 @@ 'order': 0}] ] +# vim: se ts=3: Copied: trunk/test/lib/gajim_mocks.py (from rev 10939, trunk/test/lib/mocks.py) =================================================================== --- trunk/test/lib/gajim_mocks.py (rev 0) +++ trunk/test/lib/gajim_mocks.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -0,0 +1,147 @@ +''' +Module with dummy classes for Gajim specific unit testing +''' + +from mock import Mock +from common import gajim + +from common.connection_handlers import ConnectionHandlersBase + +class MockConnection(Mock, ConnectionHandlersBase): + def __init__(self, account, *args): + Mock.__init__(self, *args) + ConnectionHandlersBase.__init__(self) + + self.name = account + self.connected = 2 + self.mood = {} + self.activity = {} + self.tune = {} + self.blocked_contacts = {} + self.blocked_groups = {} + self.sessions = {} + + gajim.interface.instances[account] = {'infos': {}, 'disco': {}, + 'gc_config': {}, 'search': {}} + gajim.interface.minimized_controls[account] = {} + gajim.contacts.add_account(account) + gajim.groups[account] = {} + gajim.gc_connected[account] = {} + gajim.automatic_rooms[account] = {} + gajim.newly_added[account] = [] + gajim.to_be_removed[account] = [] + gajim.nicks[account] = gajim.config.get_per('accounts', account, 'name') + gajim.block_signed_in_notifications[account] = True + gajim.sleeper_state[account] = 0 + gajim.encrypted_chats[account] = [] + gajim.last_message_time[account] = {} + gajim.status_before_autoaway[account] = '' + gajim.transport_avatar[account] = {} + gajim.gajim_optional_features[account] = [] + gajim.caps_hash[account] = '' + + gajim.connections[account] = self + +class MockWindow(Mock): + def __init__(self, *args): + Mock.__init__(self, *args) + self.window = Mock() + self._controls = {} + + def get_control(self, jid, account): + try: + return self._controls[account][jid] + except KeyError: + return None + + def has_control(self, jid, acct): + return self.get_control(jid, acct) is not None + + def new_tab(self, ctrl): + account = ctrl.account + jid = ctrl.jid + + if account not in self._controls: + self._controls[account] = {} + + if jid not in self._controls[account]: + self._controls[account][jid] = {} + + self._controls[account][jid] = ctrl + + def __nonzero__(self): + return True + +class MockChatControl(Mock): + def __init__(self, jid, account, *args): + Mock.__init__(self, *args) + + self.jid = jid + self.account = account + + self.parent_win = MockWindow({'get_active_control': self}) + self.session = None + + def set_session(self, sess): + self.session = sess + + def __nonzero__(self): + return True + + def __eq__(self, other): + return self is other + +class MockInterface(Mock): + def __init__(self, *args): + Mock.__init__(self, *args) + gajim.interface = self + self.msg_win_mgr = Mock() + self.roster = Mock() + + self.remote_ctrl = None + self.instances = {} + self.minimized_controls = {} + self.status_sent_to_users = Mock() + + if gajim.use_x: + self.jabber_state_images = {'16': {}, '32': {}, 'opened': {}, + 'closed': {}} + + import gtkgui_helpers + gtkgui_helpers.make_jabber_state_images() + else: + self.jabber_state_images = {'16': Mock(), '32': Mock(), + 'opened': Mock(), 'closed': Mock()} + +class MockLogger(Mock): + def __init__(self): + Mock.__init__(self, {'write': None, 'get_transports_type': {}}) + +class MockContact(Mock): + def __nonzero__(self): + return True + +import random + +class MockSession(Mock): + def __init__(self, conn, jid, thread_id, type_): + Mock.__init__(self) + + self.conn = conn + self.jid = jid + self.type = type_ + self.thread_id = thread_id + + if not self.thread_id: + self.thread_id = '%0x' % random.randint(0, 10000) + + def __repr__(self): + return '<MockSession %s>' % self.thread_id + + def __nonzero__(self): + return True + + def __eq__(self, other): + return self is other + +# vim: se ts=3: Deleted: trunk/test/lib/mocks.py =================================================================== --- trunk/test/lib/mocks.py 2009-01-11 13:42:39 UTC (rev 10966) +++ trunk/test/lib/mocks.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -1,145 +0,0 @@ -# gajim-specific mock objects -from mock import Mock - -from common import gajim - -from common.connection_handlers import ConnectionHandlersBase - -class MockConnection(Mock, ConnectionHandlersBase): - def __init__(self, account, *args): - Mock.__init__(self, *args) - ConnectionHandlersBase.__init__(self) - - self.name = account - self.connected = 2 - self.mood = {} - self.activity = {} - self.tune = {} - self.blocked_contacts = {} - self.blocked_groups = {} - self.sessions = {} - - gajim.interface.instances[account] = {'infos': {}, 'disco': {}, - 'gc_config': {}, 'search': {}} - gajim.interface.minimized_controls[account] = {} - gajim.contacts.add_account(account) - gajim.groups[account] = {} - gajim.gc_connected[account] = {} - gajim.automatic_rooms[account] = {} - gajim.newly_added[account] = [] - gajim.to_be_removed[account] = [] - gajim.nicks[account] = gajim.config.get_per('accounts', account, 'name') - gajim.block_signed_in_notifications[account] = True - gajim.sleeper_state[account] = 0 - gajim.encrypted_chats[account] = [] - gajim.last_message_time[account] = {} - gajim.status_before_autoaway[account] = '' - gajim.transport_avatar[account] = {} - gajim.gajim_optional_features[account] = [] - gajim.caps_hash[account] = '' - - gajim.connections[account] = self - -class MockWindow(Mock): - def __init__(self, *args): - Mock.__init__(self, *args) - self.window = Mock() - self._controls = {} - - def get_control(self, jid, account): - try: - return self._controls[account][jid] - except KeyError: - return None - - def has_control(self, jid, acct): - return self.get_control(jid, acct) is not None - - def new_tab(self, ctrl): - account = ctrl.account - jid = ctrl.jid - - if account not in self._controls: - self._controls[account] = {} - - if jid not in self._controls[account]: - self._controls[account][jid] = {} - - self._controls[account][jid] = ctrl - - def __nonzero__(self): - return True - -class MockChatControl(Mock): - def __init__(self, jid, account, *args): - Mock.__init__(self, *args) - - self.jid = jid - self.account = account - - self.parent_win = MockWindow({'get_active_control': self}) - self.session = None - - def set_session(self, sess): - self.session = sess - - def __nonzero__(self): - return True - - def __eq__(self, other): - return self is other - -class MockInterface(Mock): - def __init__(self, *args): - Mock.__init__(self, *args) - gajim.interface = self - self.msg_win_mgr = Mock() - self.roster = Mock() - - self.remote_ctrl = None - self.instances = {} - self.minimized_controls = {} - self.status_sent_to_users = Mock() - - if gajim.use_x: - self.jabber_state_images = {'16': {}, '32': {}, 'opened': {}, - 'closed': {}} - - import gtkgui_helpers - gtkgui_helpers.make_jabber_state_images() - else: - self.jabber_state_images = {'16': Mock(), '32': Mock(), - 'opened': Mock(), 'closed': Mock()} - -class MockLogger(Mock): - def __init__(self): - Mock.__init__(self, {'write': None, 'get_transports_type': {}}) - -class MockContact(Mock): - def __nonzero__(self): - return True - -import random - -class MockSession(Mock): - def __init__(self, conn, jid, thread_id, type_): - Mock.__init__(self) - - self.conn = conn - self.jid = jid - self.type = type_ - self.thread_id = thread_id - - if not self.thread_id: - self.thread_id = '%0x' % random.randint(0, 10000) - - def __repr__(self): - return '<MockSession %s>' % self.thread_id - - def __nonzero__(self): - return True - - def __eq__(self, other): - return self is other - -# vim: se ts=3: Copied: trunk/test/lib/xmpp_mocks.py (from rev 10939, trunk/test/xmpp_mocks.py) =================================================================== --- trunk/test/lib/xmpp_mocks.py (rev 0) +++ trunk/test/lib/xmpp_mocks.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -0,0 +1,98 @@ +''' +Module with dummy classes for unit testing of XMPP and related code. +''' + +import threading, time + +from mock import Mock + +from common.xmpp import idlequeue +from common.xmpp.plugin import PlugIn + +IDLEQUEUE_INTERVAL = 0.2 # polling interval. 200ms is used in Gajim as default +IDLEMOCK_TIMEOUT = 30 # how long we wait for an event + +class IdleQueueThread(threading.Thread): + ''' + Thread for regular processing of idlequeue. + ''' + def __init__(self): + self.iq = idlequeue.IdleQueue() + self.stop = threading.Event() # Event to stop the thread main loop. + self.stop.clear() + threading.Thread.__init__(self) + + def run(self): + while not self.stop.isSet(): + self.iq.process() + time.sleep(IDLEQUEUE_INTERVAL) + + def stop_thread(self): + self.stop.set() + + +class IdleMock: + ''' + Serves as template for testing objects that are normally controlled by GUI. + Allows to wait for asynchronous callbacks with wait() method. + ''' + def __init__(self): + self._event = threading.Event() + self._event.clear() + + def wait(self): + ''' + Block until some callback sets the event and clearing the event + subsequently. + Returns True if event was set, False on timeout + ''' + self._event.wait(IDLEMOCK_TIMEOUT) + if self._event.is_set(): + self._event.clear() + return True + else: + return False + + def set_event(self): + self._event.set() + + +class MockConnection(IdleMock, Mock): + ''' + Class simulating Connection class from src/common/connection.py + + It is derived from Mock in order to avoid defining all methods + from real Connection that are called from NBClient or Dispatcher + ( _event_dispatcher for example) + ''' + + def __init__(self, *args): + self.connect_succeeded = True + IdleMock.__init__(self) + Mock.__init__(self, *args) + + def on_connect(self, success, *args): + ''' + Method called after connecting - after receiving <stream:features> + from server (NOT after TLS stream restart) or connect failure + ''' + self.connect_succeeded = success + self.set_event() + + + def on_auth(self, con, auth): + ''' + Method called after authentication, regardless of the result. + + :Parameters: + con : NonBlockingClient + reference to authenticated object + auth : string + type of authetication in case of success ('old_auth', 'sasl') or + None in case of auth failure + ''' + self.auth_connection = con + self.auth = auth + self.set_event() + +# vim: se ts=3: Modified: trunk/test/runtests.py =================================================================== --- trunk/test/runtests.py 2009-01-11 13:42:39 UTC (rev 10966) +++ trunk/test/runtests.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -35,16 +35,18 @@ sys.exit(2) # new test modules need to be added manually +#modules = ( 'test_xmpp_dispatcher_nb', +# 'test_xmpp_client_nb', +# 'test_xmpp_transports_nb', +# 'test_resolver', +# 'test_sessions', +# 'test_caps', +# ) modules = () if use_x: modules += ('test_misc_interface', 'test_roster', - 'test_sessions', - 'test_resolver', - 'test_caps', - 'test_dispatcher_nb', - 'test_nonblockingtcp', ) nb_errors = 0 Modified: trunk/test/test_caps.py =================================================================== --- trunk/test/test_caps.py 2009-01-11 13:42:39 UTC (rev 10966) +++ trunk/test/test_caps.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -1,4 +1,6 @@ -# tests for capabilities and the capabilities cache +''' +Tests for capabilities and the capabilities cache +''' import unittest import lib Deleted: trunk/test/test_client_nb.py =================================================================== --- trunk/test/test_client_nb.py 2009-01-11 13:42:39 UTC (rev 10966) +++ trunk/test/test_client_nb.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -1,156 +0,0 @@ -''' -Testing script for NonBlockingClient class (src/common/xmpp/client_nb.py) -It actually connects to a xmpp server so the connection values have to be -changed before running. -''' - -import unittest -from xmpp_mocks import MockConnectionClass, IdleQueueThread - -import sys, os.path - -gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') -sys.path.append(gajim_root + '/src/common/xmpp') - -import client_nb - -# (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 = ['loginn', 'passwo', 'testresour'] - -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 = MockConnectionClass() - self.idlequeue_thread.start() - - def tearDown(self): - ''' IdleQueue thread is stopped. ''' - self.idlequeue_thread.stop_thread() - self.idlequeue_thread.join() - - def open_stream(self, server_port): - ''' - 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. - ''' - self.client = client_nb.NonBlockingClient( - domain=server_port[0], - idlequeue=self.idlequeue_thread.iq) - ''' - NonBlockingClient instance with parameters from global variables and with - callbacks from dummy connection. - ''' - - 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)) - - print 'waiting for callback from client constructor' - self.connection.wait() - - # 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) - - print 'waiting for authentication...' - self.connection.wait() - - def do_disconnect(self): - ''' - Does disconnecting of connected client. Returns when TCP connection is closed. - ''' - #self.client.start_disconnect(None, on_disconnect=self.connection.set_event) - self.client.RegisterDisconnectHandler(self.connection.set_event) - self.client.disconnect() - - print 'waiting for disconnecting...' - self.connection.wait() - - 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._on_connected_failure - # so there's need to call it in this case - - self.client_auth(credentials[0], credentials[1], credentials[2], sasl=1) - self.assert_(self.connection.con) - self.assert_(self.connection.auth=='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) - self.assert_(self.connection.auth=='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)) - print 'nonexthost: %s' % self.client.get_connect_type() - self.assert_(not self.client.get_connect_type()) - - def test_connect_to_wrong_port(self): - ''' - Connect to nonexisting host. DNS request for A records should return some 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) - 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() - -# vim: se ts=3: Deleted: trunk/test/test_dispatcher_nb.py =================================================================== --- trunk/test/test_dispatcher_nb.py 2009-01-11 13:42:39 UTC (rev 10966) +++ trunk/test/test_dispatcher_nb.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -1,55 +0,0 @@ -# tests for xmpppy's dispatcher_nb.py -import unittest - -import lib -lib.setup_env() - -from mock import Mock - -from common.xmpp import dispatcher_nb -from common.xmpp import auth_nb - -class TestDispatcherNB(unittest.TestCase): - def test_unbound_namespace_prefix(self): - '''tests our handling of a message with an unbound namespace prefix''' - d = dispatcher_nb.XMPPDispatcher() - - conn = Mock() - - owner = Mock() - owner._caller = Mock() - owner.defaultNamespace = auth_nb.NS_CLIENT - owner.debug_flags = [] - owner.Connection = conn - owner._component = False - - d._owner = owner - d.plugin(owner) - - msgs = [] - - def _got_message(conn, msg): - msgs.append(msg) - - d.RegisterHandler('message', _got_message) - - d.StreamInit() - - d.ProcessNonBlocking("<stream:stream xmlns:stream='http://etherx.jabber.org/streams' xmlns='jabber:client'>") - - # should be able to parse a normal message - d.ProcessNonBlocking('<message><body>hello</body></message>') - self.assertEqual(1, len(msgs)) - - d.ProcessNonBlocking('<message><x:y/></message>') - # we should not have been disconnected after that message - self.assertEqual(0, len(conn.mockGetNamedCalls('pollend'))) - - # we should be able to keep parsing - d.ProcessNonBlocking('<message><body>still here?</body></message>') - self.assertEqual(3, len(msgs)) - -if __name__ == '__main__': - unittest.main() - -# vim: se ts=3: Modified: trunk/test/test_misc_interface.py =================================================================== --- trunk/test/test_misc_interface.py 2009-01-11 13:42:39 UTC (rev 10966) +++ trunk/test/test_misc_interface.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -1,4 +1,6 @@ -# tests for the miscellaneous functions scattered throughout src/gajim.py +''' +Tests for the miscellaneous functions scattered throughout src/gajim.py +''' import unittest import lib @@ -7,7 +9,7 @@ from common import gajim from gajim import Interface -from mocks import * +from gajim_mocks import * gajim.logger = MockLogger() Interface() Deleted: trunk/test/test_nonblockingtcp.py =================================================================== --- trunk/test/test_nonblockingtcp.py 2009-01-11 13:42:39 UTC (rev 10966) +++ trunk/test/test_nonblockingtcp.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -1,84 +0,0 @@ -''' -Unit test for NonBlockingTCP tranport. -''' - -import unittest -from xmpp_mocks import IdleQueueThread, IdleMock -import sys, os.path - -gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') - -sys.path.append(gajim_root + '/src/common/xmpp') -sys.path.append(gajim_root + '/src/common') - -import transports_nb -from client import * - -xmpp_server = ('gajim.org', 5222) -''' -2-tuple - (XMPP server hostname, c2s port) -Script will connect to the machine. -''' - -import socket -ips = socket.getaddrinfo(xmpp_server[0], xmpp_server[1], - socket.AF_UNSPEC,socket.SOCK_STREAM) - -# change xmpp_server on real values -ip = ips[0] - -class MockClient(IdleMock): - - def __init__(self, idlequeue): - self.idlequeue = idlequeue - IdleMock.__init__(self) - - def do_connect(self): - self.socket = transports_nb.NonBlockingTCP( - lambda(event_type, data): sys.stdout.write('raising event %s: %s' % ( - event_type, data)), lambda: self.on_success(mode='SocketDisconnect'), - self.idlequeue, False, None) - - 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.wait() - - def do_disconnect(self): - self.socket.disconnect() - self.wait() - - def on_failure(self, data): - print 'Error: %s' % data - self.set_event() - - def on_success(self, mode, data=None): - if mode == "TCPconnect": - pass - if mode == "SocketDisconnect": - pass - self.set_event() - -class TestNonBlockingTCP(unittest.TestCase): - def setUp(self): - self.idlequeue_thread = IdleQueueThread() - self.idlequeue_thread.start() - self.client = MockClient(idlequeue=self.idlequeue_thread.iq) - - def tearDown(self): - self.idlequeue_thread.stop_thread() - self.idlequeue_thread.join() - - def test_connect_disconnect(self): - self.client.do_connect() - self.assert_(self.client.socket.state == 'CONNECTED') - self.client.do_disconnect() - self.assert_(self.client.socket.state == 'DISCONNECTED') - - -if __name__ == '__main__': - unittest.main() - -# vim: se ts=3: Modified: trunk/test/test_resolver.py =================================================================== --- trunk/test/test_resolver.py 2009-01-11 13:42:39 UTC (rev 10966) +++ trunk/test/test_resolver.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -6,13 +6,11 @@ lib.setup_env() from common import resolver -from common.xmpp.idlequeue import GlibIdleQueue from mock import Mock, expectParams -from mocks import * +from gajim_mocks import * +from xmpp_mocks import IdleQueueThread -import gtk - GMAIL_SRV_NAME = '_xmpp-client._tcp.gmail.com' NONSENSE_NAME = 'sfsdfsdfsdf.sdfs.fsd' JABBERCZ_TXT_NAME = '_xmppconnect.jabber.cz' @@ -23,21 +21,30 @@ (JABBERCZ_SRV_NAME, 'srv', True)] class TestResolver(unittest.TestCase): - ''' Test for LibAsyncNSResolver and NSLookupResolver ''' + ''' + Test for LibAsyncNSResolver and NSLookupResolver. Requires working + network connection. + ''' + def setUp(self): + self.idlequeue_thread = IdleQueueThread() + self.idlequeue_thread.start() - def setUp(self): - self.iq = GlibIdleQueue() - self.reset() + self.iq = self.idlequeue_thread.iq + self._reset() self.resolver = None + + def tear_down(self): + self.idlequeue_thread.stop_thread() + self.idlequeue_thread.join() - def reset(self): + def _reset(self): self.flag = False self.expect_results = False self.nslookup = False self.resolver = None def testLibAsyncNSResolver(self): - self.reset() + self._reset() if not resolver.USE_LIBASYNCNS: print 'testLibAsyncResolver: libasyncns-python not installed' return @@ -45,51 +52,49 @@ for name, type, expect_results in TEST_LIST: self.expect_results = expect_results - self.runLANSR(name, type) + self._runLANSR(name, type) self.flag = False - def runLANSR(self, name, type): + def _runLANSR(self, name, type): self.resolver.resolve( host = name, type = type, - on_ready = self.myonready) + on_ready = self._myonready) while not self.flag: time.sleep(1) self.resolver.process() - def myonready(self, name, result_set): + def _myonready(self, name, result_set): if __name__ == '__main__': - print 'on_ready called ...' - print 'hostname: %s' % name - print 'result set: %s' % result_set - print 'res.resolved_hosts: %s' % self.resolver.resolved_hosts + from pprint import pprint + pprint('on_ready called ...') + pprint('hostname: %s' % name) + pprint('result set: %s' % result_set) + pprint('res.resolved_hosts: %s' % self.resolver.resolved_hosts) + pprint('') if self.expect_results: self.assert_(len(result_set) > 0) else: self.assert_(result_set == []) self.flag = True - if self.nslookup: self._testNSLR() + if self.nslookup: + self._testNSLR() def testNSLookupResolver(self): - self.reset() + self._reset() self.nslookup = True self.resolver = resolver.NSLookupResolver(self.iq) self.test_list = TEST_LIST self._testNSLR() - try: - gtk.main() - except KeyboardInterrupt: - print 'KeyboardInterrupt caught' def _testNSLR(self): if self.test_list == []: - gtk.main_quit() return name, type, self.expect_results = self.test_list.pop() self.resolver.resolve( host = name, type = type, - on_ready = self.myonready) + on_ready = self._myonready) if __name__ == '__main__': unittest.main() Modified: trunk/test/test_roster.py =================================================================== --- trunk/test/test_roster.py 2009-01-11 13:42:39 UTC (rev 10966) +++ trunk/test/test_roster.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -1,14 +1,12 @@ import unittest -import time - import lib lib.setup_env() from data import * from mock import Mock, expectParams -from mocks import * +from gajim_mocks import * from common import gajim from common import zeroconf Modified: trunk/test/test_sessions.py =================================================================== --- trunk/test/test_sessions.py 2009-01-11 13:42:39 UTC (rev 10966) +++ trunk/test/test_sessions.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -9,7 +9,7 @@ from common import xmpp from mock import Mock, expectParams -from mocks import * +from gajim_mocks import * from common.stanza_session import StanzaSession @@ -17,6 +17,7 @@ account_name = 'test' class TestStanzaSession(unittest.TestCase): + ''' Testclass for common/stanzasession.py ''' def setUp(self): self.jid = 'test(a)example.org/Gajim' self.conn = MockConnection(account_name, {'send_stanza': None}) @@ -74,6 +75,7 @@ import notify class TestChatControlSession(unittest.TestCase): + ''' Testclass for session.py ''' def setUp(self): self.jid = 'test(a)example.org/Gajim' self.conn = MockConnection(account_name, {'send_stanza': None}) Copied: trunk/test/test_xmpp_client_nb.py (from rev 10951, trunk/test/test_client_nb.py) =================================================================== --- trunk/test/test_xmpp_client_nb.py (rev 0) +++ trunk/test/test_xmpp_client_nb.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -0,0 +1,156 @@ +''' +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 + + +# (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): + ''' + 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. + ''' + + self.client = client_nb.NonBlockingClient( + domain=server_port[0], + idlequeue=self.idlequeue_thread.iq, + caller=Mock()) + + 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.start_disconnect(None, on_disconnect=self.connection.set_event) + 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) + 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) + 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() + +# vim: se ts=3: Copied: trunk/test/test_xmpp_dispatcher_nb.py (from rev 10951, trunk/test/test_dispatcher_nb.py) =================================================================== --- trunk/test/test_xmpp_dispatcher_nb.py (rev 0) +++ trunk/test/test_xmpp_dispatcher_nb.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -0,0 +1,98 @@ +''' +Tests for dispatcher_nb.py +''' +import unittest + +import lib +lib.setup_env() + +from mock import Mock + +from common.xmpp import dispatcher_nb +from common.xmpp import protocol + +class TestDispatcherNB(unittest.TestCase): + ''' + Test class for NonBlocking dispatcher. Tested dispatcher will be plugged + into a mock client + ''' + def setUp(self): + self.dispatcher = dispatcher_nb.XMPPDispatcher() + + # Setup mock client + self.client = Mock() + self.client.__str__ = lambda: 'Mock' # FIXME: why do I need this one? + self.client._caller = Mock() + self.client.defaultNamespace = protocol.NS_CLIENT + self.client.Connection = Mock() # mock transport + self.con = self.client.Connection + + def tearDown(self): + # Unplug if needed + if hasattr(self.dispatcher, '_owner'): + self.dispatcher.PlugOut() + + def _simulate_connect(self): + self.dispatcher.PlugIn(self.client) # client is owner + # Simulate that we have established a connection + self.dispatcher.ProcessNonBlocking("<stream:stream xmlns:stream='http://etherx.jabber.org/streams' xmlns='jabber:client'>") + + def test_unbound_namespace_prefix(self): + '''tests our handling of a message with an unbound namespace prefix''' + self._simulate_connect() + + msgs = [] + def _got_message(conn, msg): + msgs.append(msg) + self.dispatcher.RegisterHandler('message', _got_message) + + # should be able to parse a normal message + self.dispatcher.ProcessNonBlocking('<message><body>hello</body></message>') + self.assertEqual(1, len(msgs)) + + self.dispatcher.ProcessNonBlocking('<message><x:y/></message>') + self.assertEqual(2, len(msgs)) + # we should not have been disconnected after that message + self.assertEqual(0, len(self.con.mockGetNamedCalls('pollend'))) + self.assertEqual(0, len(self.con.mockGetNamedCalls('disconnect'))) + + # we should be able to keep parsing + self.dispatcher.ProcessNonBlocking('<message><body>still here?</body></message>') + self.assertEqual(3, len(msgs)) + + def test_process_non_blocking(self): + ''' Check for ProcessNonBlocking return types ''' + self._simulate_connect() + process = self.dispatcher.ProcessNonBlocking + + # length of data expected + data = "Please don't fail" + result = process(data) + self.assertEqual(result, len(data)) + + # no data processed, link shall still be active + result = process('') + self.assertEqual(result, '0') + self.assertEqual(0, len(self.con.mockGetNamedCalls('pollend')) + + len(self.con.mockGetNamedCalls('disconnect'))) + + # simulate disconnect + result = process('</stream:stream>') + self.assertEqual(1, len(self.client.mockGetNamedCalls('disconnect'))) + + def test_return_stanza_handler(self): + ''' Test sasl_error_conditions transformation in protocol.py ''' + # quick'n dirty...I wasn't aware of it existance and thought it would + # always fail :-) + self._simulate_connect() + stanza = "<iq type='get' />" + def send(data): + self.assertEqual(str(data), '<iq xmlns="jabber:client" type="error"><error code="501" type="cancel"><feature-not-implemented xmlns="urn:ietf:params:xml:ns:xmpp-stanzas" /><text xmlns="urn:ietf:params:xml:ns:xmpp-stanzas">The feature requested is not implemented by the recipient or server and therefore cannot be processed.</text></error></iq>') + self.client.send = send + self.dispatcher.ProcessNonBlocking(stanza) + + +if __name__ == '__main__': + unittest.main() + +# vim: se ts=3: Copied: trunk/test/test_xmpp_transports_nb.py (from rev 10951, trunk/test/test_nonblockingtcp.py) =================================================================== --- trunk/test/test_xmpp_transports_nb.py (rev 0) +++ trunk/test/test_xmpp_transports_nb.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -0,0 +1,324 @@ +''' +Unit test for tranports classes. +''' + +import unittest +import socket + +import lib +lib.setup_env() + +from xmpp_mocks import IdleQueueThread, IdleMock +from common.xmpp import transports_nb + + +class TestModuleLevelFunctions(unittest.TestCase): + ''' + Test class for functions defined at module level + ''' + def test_urisplit(self): + def check_uri(uri, proto, host, path): + _proto, _host, _path = transports_nb.urisplit(uri) + self.assertEqual(proto, _proto) + self.assertEqual(host, _host) + self.assertEqual(path, _path) + check_uri('http://httpcm.jabber.org/webclient', + proto='http', host='httpcm.jabber.org', path='/webclient') + + def test_get_proxy_data_from_dict(self): + def check_dict(proxy_dict, host, port, user, passwd): + _host, _port, _user, _passwd = transports_nb.get_proxy_data_from_dict( + proxy_dict) + self.assertEqual(_host, host) + self.assertEqual(_port, port) + self.assertEqual(_user, user) + self.assertEqual(_passwd, passwd) + + bosh_dict = {'bosh_content': u'text/xml; charset=utf-8', + 'bosh_hold': 2, + 'bosh_http_pipelining': False, + 'bosh_port': 5280, + 'bosh_uri': u'http://gajim.org:5280/http-bind', + 'bosh_useproxy': False, + 'bosh_wait': 30, + 'bosh_wait_for_restart_response': False, + 'host': u'172.16.99.11', + 'pass': u'pass', + 'port': 3128, + 'type': u'bosh', + 'useauth': True, + 'user': u'user'} + check_dict(bosh_dict, host=u'gajim.org', port=80, user=u'user', + passwd=u'pass') + + proxy_dict = {'bosh_content': u'text/xml; charset=utf-8', + 'bosh_hold': 2, + 'bosh_http_pipelining': False, + 'bosh_port': 5280, + 'bosh_uri': u'', + 'bosh_useproxy': True, + 'bosh_wait': 30, + 'bosh_wait_for_restart_response': False, + 'host': u'172.16.99.11', + 'pass': u'pass', + 'port': 3128, + 'type': 'socks5', + 'useauth': True, + 'user': u'user'} + check_dict(proxy_dict, host=u'172.16.99.11', port=3128, user=u'user', + passwd=u'pass') + + +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') + + def do_disconnect(self): + self.socket.disconnect() + self.testcase.assertTrue(self.wait(), msg='Disconnect timed out') + + def on_failure(self, err_message): + self.set_event() + self.testcase.fail(msg=err_message) + + def on_success(self, mode, data=None): + if mode == "TCPconnect": + pass + if mode == "SocketDisconnect": + pass + self.set_event() + + def _setup_hook(self): + self.client = self.MockClient(idlequeue=self.idlequeue_thread.iq, + testcase=self) + + def _teardown_hook(self): + if self.client.socket.state == 'CONNECTED': + self.client.do_disconnect() + + def test_connect_disconnect_plain(self): + ''' Establish plain connection ''' + self.client.do_connect(establish_tls=False) + self.assert_(self.client.socket.state == 'CONNECTED') + self.client.do_disconnect() + self.assert_(self.client.socket.state == 'DISCONNECTED') + + # FIXME: testcase not working... + #def test_connect_disconnect_ssl(self): + # ''' Establish SSL (not TLS) connection ''' + # self.client.do_connect(establish_tls=True) + # self.assert_(self.client.socket.state == 'CONNECTED') + # self.client.do_disconnect() + # self.assert_(self.client.socket.state == 'DISCONNECTED') + + def test_do_receive(self): + ''' Test _do_receive method by overwriting socket.recv ''' + self.client.do_connect() + sock = self.client.socket + + # transport shall receive data + data = "Please don't fail" + sock._recv = lambda buffer: data + sock.onreceive(self.expect_receive(data)) + sock._do_receive() + self.assertTrue(self.have_received_expected(), msg='Did not receive data') + self.assert_(self.client.socket.state == 'CONNECTED') + + # transport shall do nothing as an non-fatal SSL is simulated + sock._recv = lambda buffer: None + sock.onreceive(self.assertFalse) # we did not receive anything... + sock._do_receive() + self.assert_(self.client.socket.state == 'CONNECTED') + + # transport shall disconnect as remote side closed the connection + sock._recv = lambda buffer: '' + sock.onreceive(self.assertFalse) # we did not receive anything... + sock._do_receive() + self.assert_(self.client.socket.state == 'DISCONNECTED') + + def test_do_send(self): + ''' Test _do_send method by overwriting socket.send ''' + self.client.do_connect() + sock = self.client.socket + + outgoing = [] # what we have actually send to our socket.socket + data_part1 = "Please don't " + data_part2 = "fail!" + data_complete = data_part1 + data_part2 + + # Simulate everything could be send in one go + def _send_all(data): + outgoing.append(data) + return len(data) + sock._send = _send_all + sock.send(data_part1) + sock.send(data_part2) + sock._do_send() + sock._do_send() + self.assertTrue(self.client.socket.state == 'CONNECTED') + self.assertTrue(data_part1 in outgoing and data_part2 in outgoing) + self.assertFalse(sock.sendqueue and sock.sendbuff, + msg='There is still unsend data in buffers') + + # Simulate data could only be sent in chunks + self.chunk_count = 0 + outgoing = [] + def _send_chunks(data): + if self.chunk_count == 0: + outgoing.append(data_part1) + self.chunk_count += 1 + return len(data_part1) + else: + outgoing.append(data_part2) + return len(data_part2) + sock._send = _send_chunks + sock.send(data_complete) + sock._do_send() # process first chunk + sock._do_send() # process the second one + self.assertTrue(self.client.socket.state == 'CONNECTED') + self.assertTrue(data_part1 in outgoing and data_part2 in outgoing) + self.assertFalse(sock.sendqueue and sock.sendbuff, + msg='There is still unsend data in buffers') + + +class TestNonBlockingHTTP(AbstractTransportTest): + ''' Test class for NonBlockingHTTP transport''' + + bosh_http_dict = { + 'http_uri': 'http://httpcm.jabber.org/webclient', + 'http_port': 1010, + 'http_version': 'HTTP/1.1', + 'http_persistent': True, + 'add_proxy_headers': False + } + + def _get_transport(self, http_dict, proxy_dict=None): + return transports_nb.NonBlockingHTTP( + raise_event=None, + on_disconnect=None, + idlequeue=self.idlequeue_thread.iq, + estabilish_tls=False, + certs=None, + on_http_request_possible=lambda: None, + on_persistent_fallback=None, + http_dict=http_dict, + proxy_dict=proxy_dict, + ) + + def test_parse_own_http_message(self): + ''' Build a HTTP message and try to parse it afterwards ''' + transport = self._get_transport(self.bosh_http_dict) + + data = "<test>Please don't fail!</test>" + http_message = transport.build_http_message(data) + statusline, headers, http_body = transport.parse_http_message( + http_message) + + self.assertTrue(statusline and isinstance(statusline, list)) + self.assertTrue(headers and isinstance(headers, dict)) + self.assertEqual(data, http_body, msg='Input and output are different') + + def test_receive_http_message(self): + ''' Let _on_receive handle some http messages ''' + transport = self._get_transport(self.bosh_http_dict) + + header = ("HTTP/1.1 200 OK\r\nContent-Type: text/xml; charset=utf-8\r\n" + + "Content-Length: 88\r\n\r\n") + payload = "<test>Please don't fail!</test>" + body = "<body xmlns='http://jabber.org/protocol/httpbind'>%s</body>" \ + % payload + message = "%s%s" % (header, body) + + # try to receive in one go + transport.onreceive(self.expect_receive(body, msg='Failed: In one go')) + transport._on_receive(message) + self.assertTrue(self.have_received_expected(), msg='Failed: In one go') + + # try to receive in chunks + chunk1, chunk2, chunk3 = message[:20], message[20:73], message[73:] + nextmessage_chunk = "\r\n\r\nHTTP/1.1 200 OK\r\nContent-Type: text/x" + chunks = (chunk1, chunk2, chunk3, nextmessage_chunk) + + transport.onreceive(self.expect_receive(body, msg='Failed: In chunks')) + for chunk in chunks: + transport._on_receive(chunk) + self.assertTrue(self.have_received_expected(), msg='Failed: In chunks') + +if __name__ == '__main__': + unittest.main() + +# vim: se ts=3: Deleted: trunk/test/xmpp_mocks.py =================================================================== --- trunk/test/xmpp_mocks.py 2009-01-11 13:42:39 UTC (rev 10966) +++ trunk/test/xmpp_mocks.py 2009-01-11 13:49:03 UTC (rev 10967) @@ -1,116 +0,0 @@ -''' -Module with dummy classes for unit testing of XMPP and related code. -''' - -import threading, time, os.path, sys - -gajim_root = os.path.join(os.path.abspath(os.path.dirname(__file__)), '..') -sys.path.append(gajim_root + '/src/common/xmpp') -import idlequeue -from client import PlugIn - -import lib -lib.setup_env() - - -from mock import Mock - - - -idlequeue_interval = 0.2 -''' -IdleQueue polling interval. 200ms is used in Gajim as default -''' - -class IdleQueueThread(threading.Thread): - ''' - Thread for regular processing of idlequeue. - ''' - def __init__(self): - self.iq = idlequeue.IdleQueue() - self.stop = threading.Event() - ''' - Event used to stopping the thread main loop. - ''' - - self.stop.clear() - threading.Thread.__init__(self) - - def run(self): - while not self.stop.isSet(): - self.iq.process() - time.sleep(idlequeue_interval) - - def stop_thread(self): - self.stop.set() - - -class IdleMock: - ''' - Serves as template for testing objects that are normally controlled by GUI. - Allows to wait for asynchronous callbacks with wait() method. - ''' - def __init__(self): - self.event = threading.Event() - ''' - Event is used for waiting on callbacks. - ''' - self.event.clear() - - def wait(self): - ''' - Waiting until some callback sets the event and clearing the event - subsequently. - ''' - self.event.wait() - self.event.clear() - - def set_event(self): - self.event.set() - - -class MockConnectionClass(IdleMock, Mock): - ''' - Class simulating Connection class from src/common/connection.py - - It is derived from Mock in order to avoid defining all methods - from real Connection that are called from NBClient or Dispatcher - ( _event_dispatcher for example) - ''' - - def __init__(self, *args): - self.connect_succeeded = True - IdleMock.__init__(self) - Mock.__init__(self, *args) - - def on_connect(self, success, *args): - ''' - Method called after connecting - after receiving <stream:features> - from server (NOT after TLS stream restart) or connect failure - ''' - #print 'on_connect - args:' - #print ' success - %s' % success - #for i in args: - # print ' %s' % i - self.connect_succeeded = success - self.set_event() - - def on_auth(self, con, auth): - ''' - Method called after authentication, regardless of the result. - - :Parameters: - con : NonBlockingClient - reference to authenticated object - auth : string - type of authetication in case of success ('old_auth', 'sasl') or - None in case of auth failure - ''' - #print 'on_auth - args:' - #print ' con: %s' % con - #print ' auth: %s' % auth - self.auth_connection = con - self.auth = auth - self.set_event() - -# vim: se ts=3:

1 0

[commit-gajim] r10966 - trunk/src/common/xmpp
by steve-e＠gajim.org 11 Jan '09

11 Jan '09

Author: steve-e Date: 2009-01-11 14:42:39 +0100 (Sun, 11 Jan 2009) New Revision: 10966 Modified: trunk/src/common/xmpp/client_nb.py trunk/src/common/xmpp/dispatcher_nb.py trunk/src/common/xmpp/transports_nb.py Log: Add some FIXME statements due to open questions. Improve a two default parameters. Modified: trunk/src/common/xmpp/client_nb.py =================================================================== --- trunk/src/common/xmpp/client_nb.py 2009-01-11 09:55:39 UTC (rev 10965) +++ trunk/src/common/xmpp/client_nb.py 2009-01-11 13:42:39 UTC (rev 10966) @@ -92,6 +92,8 @@ self.NonBlockingHTTP.PlugOut() if 'NonBlockingBOSH' in self.__dict__: self.NonBlockingBOSH.PlugOut() + # FIXME: we never unplug dispatcher, only on next connect + # See _xmpp_connect_machine and SASLHandler connected = self.connected stream_started = self.stream_started @@ -129,7 +131,7 @@ self.disconnecting = False def connect(self, on_connect, on_connect_failure, hostname=None, port=5222, - on_proxy_failure=None, proxy=None, secure_tuple=(None, None, None)): + on_proxy_failure=None, proxy=None, secure_tuple=('plain', None, None)): ''' Open XMPP connection (open XML streams in both directions). @@ -353,22 +355,22 @@ # if stream version is less than 1.0, we can't do more log.warn('While connecting with type = "tls": stream version is less than 1.0') self._on_connect() - return if self.Dispatcher.Stream.features.getTag('starttls'): # Server advertises TLS support, start negotiation self.stream_started = False log.info('TLS supported by remote server. Requesting TLS start.') self._tls_negotiation_handler() - return else: log.warn('While connecting with type = "tls": TLS unsupported by remote server') self._on_connect() return - + elif self.connected in ['ssl', 'tls']: self._on_connect() return - assert False # should never be reached + else: + log.error('Stream opened for unsupported connection: %s' % + (self.connected or 'Disconnected')) def _tls_negotiation_handler(self, con=None, tag=None): ''' takes care of TLS negotioation with <starttls> ''' @@ -477,7 +479,7 @@ # wrong user/pass, stop auth if 'SASL' in self.__dict__: self.SASL.PlugOut() - self.connected = None # FIXME: is this intended? + self.connected = None # FIXME: is this intended? We use ''elsewhere self._on_sasl_auth(None) elif self.SASL.startsasl == 'success': auth_nb.NonBlockingBind.get_instance().PlugIn(self) Modified: trunk/src/common/xmpp/dispatcher_nb.py =================================================================== --- trunk/src/common/xmpp/dispatcher_nb.py 2009-01-11 09:55:39 UTC (rev 10965) +++ trunk/src/common/xmpp/dispatcher_nb.py 2009-01-11 13:42:39 UTC (rev 10966) @@ -52,6 +52,8 @@ XMPPDispatcher().PlugIn(client_obj) elif client_obj.protocol_type == 'BOSH': BOSHDispatcher().PlugIn(client_obj, after_SASL, old_features) + else: + assert False # should never be reached @classmethod def get_instance(cls, *args, **kwargs): @@ -111,6 +113,8 @@ ''' Registers default namespaces/protocols/handlers. Used internally. ''' + # FIXME: inject dependencies, do not rely that they are defined by our + # owner self.RegisterNamespace('unknown') self.RegisterNamespace(NS_STREAMS) self.RegisterNamespace(self._owner.defaultNamespace) @@ -162,7 +166,7 @@ raise ValueError('Incorrect stream start: (%s,%s). Terminating.' % (tag, ns)) - def ProcessNonBlocking(self, data=None): + def ProcessNonBlocking(self, data): ''' Check incoming stream for data waiting. @@ -172,6 +176,11 @@ 2) '0' string if no data were processed but link is alive; 3) 0 (zero) if underlying connection is closed. ''' + # FIXME: + # When an error occurs we disconnect the transport directly. Client's + # disconnect method will never be called. + # Is this intended? + # also look at transports start_disconnect() for handler in self._cycleHandlers: handler(self) if len(self._pendingExceptions) > 0: @@ -317,7 +326,7 @@ ''' self._eventHandler = handler - def returnStanzaHandler(self,conn,stanza): + def returnStanzaHandler(self, conn, stanza): ''' Return stanza back to the sender with <feature-not-implemented/> error set ''' @@ -348,6 +357,8 @@ ''' if self._eventHandler: self._eventHandler(realm, event, data) + else: + log.warning('Received unhandled event: %s' % event) def dispatch(self, stanza, session=None, direct=0): ''' Modified: trunk/src/common/xmpp/transports_nb.py =================================================================== --- trunk/src/common/xmpp/transports_nb.py 2009-01-11 09:55:39 UTC (rev 10965) +++ trunk/src/common/xmpp/transports_nb.py 2009-01-11 13:42:39 UTC (rev 10966) @@ -239,6 +239,7 @@ else: self.on_timeout = None + # FIXME: where and why does this need to be called def start_disconnect(self): self.set_state(DISCONNECTING) @@ -267,7 +268,8 @@ self.proxy_dict = proxy_dict self.on_remote_disconnect = self.disconnect - + + # FIXME: transport should not be aware xmpp def start_disconnect(self): NonBlockingTransport.start_disconnect(self) self.send('</stream:stream>', now=True)

1 0

[commit-gajim] r10965 - trunk/src
by asterix＠gajim.org 11 Jan '09

11 Jan '09

Author: asterix Date: 2009-01-11 10:55:39 +0100 (Sun, 11 Jan 2009) New Revision: 10965 Modified: trunk/src/features_window.py Log: [shivan] improve strings in features window, make list sorted. Fixes #4571 Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2009-01-10 22:47:17 UTC (rev 10964) +++ trunk/src/features_window.py 2009-01-11 09:55:39 UTC (rev 10965) @@ -42,7 +42,7 @@ # {name: (available_function, unix_text, windows_text)} self.features = { - _('PyOpenSSL'): (self.pyopenssl_available, + _('SSL certificat validation'): (self.pyopenssl_available, _('A library used to validate server certificates to ensure a secure connection.'), _('Requires python-pyopenssl.'), _('Requires python-pyopenssl.')), @@ -50,15 +50,15 @@ _('Serverless chatting with autodetected clients in a local network.'), _('Requires python-avahi.'), _('Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour).')), - _('gajim-remote'): (self.dbus_available, + _('Command line'): (self.dbus_available, _('A script to control Gajim via commandline.'), _('Requires python-dbus.'), _('Feature not available under Windows.')), - _('OpenGPG'): (self.gpg_available, - _('Encrypting chatmessages with gpg keys.'), + _('OpenGPG message encryption'): (self.gpg_available, + _('Encrypting chat messages with gpg keys.'), _('Requires gpg and python-GnuPGInterface.'), _('Feature not available under Windows.')), - _('network-manager'): (self.network_manager_available, + _('Network-manager'): (self.network_manager_available, _('Autodetection of network status.'), _('Requires gnome-network-manager and python-dbus.'), _('Feature not available under Windows.')), @@ -66,7 +66,7 @@ _('Gajim session is stored on logout and restored on login.'), _('Requires python-gnome2.'), _('Feature not available under Windows.')), - _('gnome-keyring'): (self.gnome_keyring_available, + _('Password encryption'): (self.gnome_keyring_available, _('Passwords can be stored securely and not just in plaintext.'), _('Requires gnome-keyring and python-gnome2-desktop.'), _('Feature not available under Windows.')), @@ -78,7 +78,7 @@ _('Spellchecking of composed messages.'), _('Requires python-gnome2-extras or compilation of gtkspell module from Gajim sources.'), _('Feature not available under Windows.')), - _('Notification-daemon'): (self.notification_available, + _('Notification'): (self.notification_available, _('Passive popups notifying for new events.'), _('Requires python-notify or instead python-dbus in conjunction with notification-daemon.'), _('Feature not available under Windows.')), @@ -86,7 +86,7 @@ _('A icon in systemtray reflecting the current presence.'), _('Requires python-gnome2-extras or compiled trayicon module from Gajim sources.'), _('Requires PyGTK >= 2.10.')), - _('Idle'): (self.idle_available, + _('Automatic status'): (self.idle_available, _('Ability to measure idle time, in order to set auto status.'), _('Requires libxss library.'), _('Requires python2.5.')), @@ -94,15 +94,15 @@ _('Transform LaTeX expressions between $$ $$.'), _('Requires texlive-latex-base and dvipng. You have to set \'use_latex\' to True in the Advanced Configuration Editor.'), _('Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set \'use_latex\' to True in the Advanced Configuration Editor.')), - _('End to End Encryption'): (self.pycrypto_available, - _('Encrypting chatmessages.'), + _('End to End message encryption'): (self.pycrypto_available, + _('Encrypting chat messages.'), _('Requires python-crypto.'), _('Requires python-crypto.')), _('RST Generator'): (self.docutils_available, _('Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html).'), _('Requires python-docutils.'), _('Requires python-docutils.')), - _('libsexy'): (self.pysexy_available, + _('Banners and clickable links'): (self.pysexy_available, _('Ability to have clickable URLs in chat and groupchat window banners.'), _('Requires python-sexy.'), _('Requires python-sexy.')), @@ -130,6 +130,9 @@ func = self.features[feature][0] rep = func() self.model.append([feature, rep]) + + self.model.set_sort_column_id(0, gtk.SORT_ASCENDING) + self.xml.signal_autoconnect(self) self.window.show_all() self.xml.get_widget('close_button').grab_focus()

1 0

[commit-gajim] r10964 - branches/osx_newbuildsys/src/common/xmpp
by js＠gajim.org 10 Jan '09

10 Jan '09

Author: js Date: 2009-01-10 23:47:17 +0100 (Sat, 10 Jan 2009) New Revision: 10964 Modified: branches/osx_newbuildsys/src/common/xmpp/client_nb.py Log: Merge trunk r10963. Modified: branches/osx_newbuildsys/src/common/xmpp/client_nb.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/client_nb.py 2009-01-10 22:46:26 UTC (rev 10963) +++ branches/osx_newbuildsys/src/common/xmpp/client_nb.py 2009-01-10 22:47:17 UTC (rev 10964) @@ -346,6 +346,7 @@ if self.desired_security == 'plain': # if we want and have plain connection, we're done now self._on_connect() + return else: # try to negotiate TLS if self.incoming_stream_version() != '1.0': @@ -358,12 +359,15 @@ self.stream_started = False log.info('TLS supported by remote server. Requesting TLS start.') self._tls_negotiation_handler() + return else: log.warn('While connecting with type = "tls": TLS unsupported by remote server') self._on_connect() + return elif self.connected in ['ssl', 'tls']: self._on_connect() + return assert False # should never be reached def _tls_negotiation_handler(self, con=None, tag=None):

1 0

[commit-gajim] r10963 - trunk/src/common/xmpp
by js＠gajim.org 10 Jan '09

10 Jan '09

Author: js Date: 2009-01-10 23:46:26 +0100 (Sat, 10 Jan 2009) New Revision: 10963 Modified: trunk/src/common/xmpp/client_nb.py Log: Fix missing returns, so we don't run into that assert. Modified: trunk/src/common/xmpp/client_nb.py =================================================================== --- trunk/src/common/xmpp/client_nb.py 2009-01-10 22:03:22 UTC (rev 10962) +++ trunk/src/common/xmpp/client_nb.py 2009-01-10 22:46:26 UTC (rev 10963) @@ -346,6 +346,7 @@ if self.desired_security == 'plain': # if we want and have plain connection, we're done now self._on_connect() + return else: # try to negotiate TLS if self.incoming_stream_version() != '1.0': @@ -358,12 +359,15 @@ self.stream_started = False log.info('TLS supported by remote server. Requesting TLS start.') self._tls_negotiation_handler() + return else: log.warn('While connecting with type = "tls": TLS unsupported by remote server') self._on_connect() + return elif self.connected in ['ssl', 'tls']: self._on_connect() + return assert False # should never be reached def _tls_negotiation_handler(self, con=None, tag=None):

1 0

[commit-gajim] r10962 - in branches/osx_newbuildsys/src: . common common/xmpp
by js＠gajim.org 10 Jan '09

10 Jan '09

Author: js Date: 2009-01-10 23:03:22 +0100 (Sat, 10 Jan 2009) New Revision: 10962 Modified: branches/osx_newbuildsys/src/common/connection.py branches/osx_newbuildsys/src/common/connection_handlers.py branches/osx_newbuildsys/src/common/latex.py branches/osx_newbuildsys/src/common/xmpp/bosh.py branches/osx_newbuildsys/src/common/xmpp/transports_nb.py branches/osx_newbuildsys/src/roster_window.py Log: Complete merge with latest trunk (r10956). Modified: branches/osx_newbuildsys/src/common/connection.py =================================================================== --- branches/osx_newbuildsys/src/common/connection.py 2009-01-10 21:58:13 UTC (rev 10961) +++ branches/osx_newbuildsys/src/common/connection.py 2009-01-10 22:03:22 UTC (rev 10962) @@ -223,7 +223,7 @@ if gajim.account_is_connected(self.name): # we cannot change our status to offline or connecting # after we auth to server - self.old_show = STATUS_LIST[self.connected] + self.old_show = gajim.SHOW_LIST[self.connected] self.connected = 0 if not self.on_purpose: self.dispatch('STATUS', 'offline') @@ -856,14 +856,39 @@ return common.xmpp.features_nb.setDefaultPrivacyList(self.connection, listname) - def build_privacy_rule(self, name, action): + def build_privacy_rule(self, name, action, order=1): '''Build a Privacy rule stanza for invisibility''' iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '') l = iq.getTag('query').setTag('list', {'name': name}) - i = l.setTag('item', {'action': action, 'order': '1'}) + i = l.setTag('item', {'action': action, 'order': str(order)}) i.setTag('presence-out') return iq + def build_invisible_rule(self): + iq = common.xmpp.Iq('set', common.xmpp.NS_PRIVACY, xmlns = '') + l = iq.getTag('query').setTag('list', {'name': 'invisible'}) + if self.name in gajim.interface.status_sent_to_groups and \ + len(gajim.interface.status_sent_to_groups[self.name]) > 0: + for group in gajim.interface.status_sent_to_groups[self.name]: + i = l.setTag('item', {'type': 'group', 'value': group, + 'action': 'allow', 'order': '1'}) + i.setTag('presence-out') + if self.name in gajim.interface.status_sent_to_users and \ + len(gajim.interface.status_sent_to_users[self.name]) > 0: + for jid in gajim.interface.status_sent_to_users[self.name]: + i = l.setTag('item', {'type': 'jid', 'value': jid, + 'action': 'allow', 'order': '2'}) + i.setTag('presence-out') + i = l.setTag('item', {'action': 'deny', 'order': '3'}) + i.setTag('presence-out') + return iq + + def set_invisible_rule(self): + if not gajim.account_is_connected(self.name): + return + iq = self.build_invisible_rule() + self.connection.send(iq) + def activate_privacy_rule(self, name): '''activate a privacy rule''' if not self.connection: @@ -892,7 +917,7 @@ self.connection.send(p) # try to set the privacy rule - iq = self.build_privacy_rule('invisible', 'deny') + iq = self.build_invisible_rule() self.connection.SendAndCallForResponse(iq, self._continue_invisible, {'msg': msg, 'signed': signed, 'initial': initial}) @@ -902,7 +927,7 @@ # active the privacy rule self.privacy_rules_supported = True self.activate_privacy_rule('invisible') - self.connected = STATUS_LIST.index('invisible') + self.connected = gajim.SHOW_LIST.index('invisible') self.status = msg priority = unicode(gajim.get_priority(self.name, 'invisible')) p = common.xmpp.Presence(priority = priority) @@ -984,7 +1009,7 @@ self.connection.send(iq) def send_custom_status(self, show, msg, jid): - if not show in STATUS_LIST: + if not show in gajim.SHOW_LIST: return -1 if not self.connection: return @@ -1009,7 +1034,7 @@ self.connection.send(p) def change_status(self, show, msg, auto = False): - if not show in STATUS_LIST: + if not show in gajim.SHOW_LIST: return -1 sshow = helpers.get_xmpp_show(show) if not msg: @@ -1067,8 +1092,8 @@ signed = self.get_signed_presence(msg) self.send_invisible_presence(msg, signed) return - was_invisible = self.connected == STATUS_LIST.index('invisible') - self.connected = STATUS_LIST.index(show) + was_invisible = self.connected == gajim.SHOW_LIST.index('invisible') + self.connected = gajim.SHOW_LIST.index(show) if was_invisible and self.privacy_rules_supported: iq = self.build_privacy_rule('visible', 'allow') self.connection.send(iq) @@ -1092,7 +1117,7 @@ self.dispatch('STATUS', 'offline') def get_status(self): - return STATUS_LIST[self.connected] + return gajim.SHOW_LIST[self.connected] def send_motd(self, jid, subject = '', msg = '', xhtml = None): @@ -1536,7 +1561,7 @@ def send_agent_status(self, agent, ptype): if not self.connection: return - show = helpers.get_xmpp_show(STATUS_LIST[self.connected]) + show = helpers.get_xmpp_show(gajim.SHOW_LIST[self.connected]) p = common.xmpp.Presence(to = agent, typ = ptype, show = show) p = self.add_sha(p, ptype != 'unavailable') self.connection.send(p) @@ -1559,7 +1584,7 @@ # FIXME: This room JID needs to be normalized; see #1364 if not self.connection: return - show = helpers.get_xmpp_show(STATUS_LIST[self.connected]) + show = helpers.get_xmpp_show(gajim.SHOW_LIST[self.connected]) if show == 'invisible': # Never join a room when invisible return Modified: branches/osx_newbuildsys/src/common/connection_handlers.py =================================================================== --- branches/osx_newbuildsys/src/common/connection_handlers.py 2009-01-10 21:58:13 UTC (rev 10961) +++ branches/osx_newbuildsys/src/common/connection_handlers.py 2009-01-10 22:03:22 UTC (rev 10962) @@ -59,8 +59,6 @@ import logging log = logging.getLogger('gajim.c.connection_handlers') -STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', - 'invisible', 'error'] # kind of events we can wait for an answer VCARD_PUBLISHED = 'vcard_published' VCARD_ARRIVED = 'vcard_arrived' @@ -1084,12 +1082,12 @@ self.save_vcard_to_hd(our_jid, vcard_iq) # Send new presence if sha changed and we are not invisible - if self.vcard_sha != new_sha and STATUS_LIST[self.connected] != \ + if self.vcard_sha != new_sha and gajim.SHOW_LIST[self.connected] !=\ 'invisible': if not self.connection or self.connected < 2: return self.vcard_sha = new_sha - sshow = helpers.get_xmpp_show(STATUS_LIST[self.connected]) + sshow = helpers.get_xmpp_show(gajim.SHOW_LIST[self.connected]) p = common.xmpp.Presence(typ = None, priority = self.priority, show = sshow, status = self.status) p = self.add_sha(p) @@ -1256,11 +1254,11 @@ if self.vcard_sha == avatar_sha: return self.vcard_sha = avatar_sha - if STATUS_LIST[self.connected] == 'invisible': + if gajim.SHOW_LIST[self.connected] == 'invisible': return if not self.connection: return - sshow = helpers.get_xmpp_show(STATUS_LIST[self.connected]) + sshow = helpers.get_xmpp_show(gajim.SHOW_LIST[self.connected]) p = common.xmpp.Presence(typ = None, priority = self.priority, show = sshow, status = self.status) p = self.add_sha(p) @@ -2042,7 +2040,7 @@ status = prs.getStatus() or '' show = prs.getShow() - if not show in STATUS_LIST: + if not show in gajim.SHOW_LIST: show = '' # We ignore unknown show if not ptype and not show: show = 'online' @@ -2399,7 +2397,7 @@ _('You will be connected to %s without OpenPGP.') % self.name)) self.USE_GPG = False signed = '' - self.connected = STATUS_LIST.index(show) + self.connected = gajim.SHOW_LIST.index(show) sshow = helpers.get_xmpp_show(show) # send our presence if show == 'invisible': Modified: branches/osx_newbuildsys/src/common/latex.py =================================================================== --- branches/osx_newbuildsys/src/common/latex.py 2009-01-10 21:58:13 UTC (rev 10961) +++ branches/osx_newbuildsys/src/common/latex.py 2009-01-10 22:03:22 UTC (rev 10962) @@ -30,8 +30,11 @@ import os import random from tempfile import gettempdir -from subprocess import Popen +from subprocess import Popen, PIPE +import logging +log = logging.getLogger('gajim.c.latex') + import gajim from exceptions import LatexError @@ -72,12 +75,14 @@ file_.close() # a wrapper for Popen so that no window gets opened on Windows +# (i think this is the reason we're using Popen rather than just system()) +# stdout goes to a pipe so that it can be read def popen_nt_friendly(command): if os.name == 'nt': # CREATE_NO_WINDOW - return Popen(command, creationflags=0x08000000, cwd=gettempdir()) + return Popen(command, creationflags=0x08000000, cwd=gettempdir(), stdout=PIPE) else: - return Popen(command, cwd=gettempdir()) + return Popen(command, cwd=gettempdir(), stdout=PIPE) def check_for_latex_support(): '''check is latex is available and if it can create a picture.''' @@ -110,6 +115,8 @@ try: p = popen_nt_friendly(['latex', '--interaction=nonstopmode', tmpfile + '.tex']) + out = p.communicate()[0] + log.info(out) exitcode = p.wait() except Exception, e: exitcode = _('Error executing "%(command)s": %(error)s') % { @@ -123,6 +130,8 @@ p = popen_nt_friendly(['dvipng', '-bg', 'rgb 1.0 1.0 1.0', '-T', 'tight', '-D', latex_png_dpi, tmpfile + '.dvi', '-o', tmpfile + '.png']) + out = p.communicate()[0] + log.info(out) exitcode = p.wait() except Exception, e: exitcode = _('Error executing "%(command)s": %(error)s') % { Modified: branches/osx_newbuildsys/src/common/xmpp/bosh.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/bosh.py 2009-01-10 21:58:13 UTC (rev 10961) +++ branches/osx_newbuildsys/src/common/xmpp/bosh.py 2009-01-10 22:03:22 UTC (rev 10962) @@ -104,7 +104,7 @@ self.after_init = True self.http_socks.append(self.get_new_http_socket()) - self.tcp_connecting_started() + self._tcp_connecting_started() self.http_socks[0].connect( conn_5tuple = conn_5tuple, Modified: branches/osx_newbuildsys/src/common/xmpp/transports_nb.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/transports_nb.py 2009-01-10 21:58:13 UTC (rev 10961) +++ branches/osx_newbuildsys/src/common/xmpp/transports_nb.py 2009-01-10 22:03:22 UTC (rev 10962) @@ -200,7 +200,7 @@ Do not confuse it with on_receive() method, which is the callback itself. ''' if not recv_handler: - if hasattr(self._owner, 'Dispatcher'): + if hasattr(self, '_owner') and hasattr(self._owner, 'Dispatcher'): self.on_receive = self._owner.Dispatcher.ProcessNonBlocking else: log.warning('No Dispatcher plugged. Received data will not be processed') @@ -208,7 +208,7 @@ return self.on_receive = recv_handler - def tcp_connecting_started(self): + def _tcp_connecting_started(self): self.set_state(CONNECTING) def read_timeout(self): @@ -313,7 +313,7 @@ # connecting in progress log.info('After NB connect() of %s. "%s" raised => CONNECTING' % (id(self), errstr)) - self.tcp_connecting_started() + self._tcp_connecting_started() return # if there was some other exception, call failure callback and unplug @@ -397,7 +397,8 @@ return self.set_state(DISCONNECTED) self.idlequeue.unplug_idle(self.fd) - if 'NonBlockingTLS' in self.__dict__: self.NonBlockingTLS.PlugOut() + if 'NonBlockingTLS' in self.__dict__: + self.NonBlockingTLS.PlugOut() try: self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() @@ -513,7 +514,8 @@ exc_info=True) errnum, errstr = e.exc - if received == '': errstr = 'zero bytes on recv' + if received == '': + errstr = 'zero bytes on recv' if (self.ssl_lib is None and received == '') or \ (self.ssl_lib == tls_nb.PYSTDLIB and errnum == 8 ) or \ @@ -563,7 +565,7 @@ def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, certs, on_http_request_possible, on_persistent_fallback, http_dict, - proxy_dict = None): + proxy_dict=None): ''' :param on_http_request_possible: method to call when HTTP request to socket owned by transport is possible. Modified: branches/osx_newbuildsys/src/roster_window.py =================================================================== --- branches/osx_newbuildsys/src/roster_window.py 2009-01-10 21:58:13 UTC (rev 10961) +++ branches/osx_newbuildsys/src/roster_window.py 2009-01-10 22:03:22 UTC (rev 10962) @@ -2045,7 +2045,7 @@ # unset custom status if account in gajim.interface.status_sent_to_users and \ - contact.jid in gajim.interface.status_sent_to_users[account]: + contact.jid in gajim.interface.status_sent_to_users[account]: del gajim.interface.status_sent_to_users[account][contact.jid] # Delete pep if needed @@ -3156,24 +3156,40 @@ def on_send_custom_status(self, widget, contact_list, show, group=None): '''send custom status''' + # contact_list has only one element except if group != None def on_response(message): if message is None: # None if user pressed Cancel return + account_list = [] for (contact, account) in contact_list: - our_jid = gajim.get_jid_from_account(account) - accounts = [] - if group and account not in accounts: + if account not in account_list: + account_list.append(account) + # 1. update status_sent_to_[groups|users] list + if group: + for account in account_list: if account not in gajim.interface.status_sent_to_groups: gajim.interface.status_sent_to_groups[account] = {} gajim.interface.status_sent_to_groups[account][group] = show - accounts.append(group) + else: + for (contact, account) in contact_list: + if account not in gajim.interface.status_sent_to_users: + gajim.interface.status_sent_to_users[account] = {} + gajim.interface.status_sent_to_users[account][contact.jid] = show + + # 2. update privacy lists if main status is invisible + for account in account_list: + if gajim.SHOW_LIST[gajim.connections[account].connected] == \ + 'invisible': + gajim.connections[account].set_invisible_rule() + + # 3. send directed presence + for (contact, account) in contact_list: + our_jid = gajim.get_jid_from_account(account) jid = contact.jid if jid == our_jid: jid += '/' + contact.resource self.send_status(account, show, message, to=jid) - if account not in gajim.interface.status_sent_to_users: - gajim.interface.status_sent_to_users[account] = {} - gajim.interface.status_sent_to_users[account][contact.jid] = show + dialogs.ChangeStatusMessageDialog(on_response, show) def on_status_combobox_changed(self, widget):

1 0

[commit-gajim] r10961 - in branches/osx_newbuildsys: data/glade src src/common
by js＠gajim.org 10 Jan '09

10 Jan '09

Author: js Date: 2009-01-10 22:58:13 +0100 (Sat, 10 Jan 2009) New Revision: 10961 Added: branches/osx_newbuildsys/src/common/latex.py Modified: branches/osx_newbuildsys/data/glade/vcard_information_window.glade branches/osx_newbuildsys/src/common/Makefile branches/osx_newbuildsys/src/common/exceptions.py branches/osx_newbuildsys/src/common/gajim.py branches/osx_newbuildsys/src/conversation_textview.py branches/osx_newbuildsys/src/features_window.py branches/osx_newbuildsys/src/roster_window.py branches/osx_newbuildsys/src/secrets.py Log: Merge trunk r10950. Rest follows. Modified: branches/osx_newbuildsys/data/glade/vcard_information_window.glade =================================================================== --- branches/osx_newbuildsys/data/glade/vcard_information_window.glade 2009-01-10 21:56:21 UTC (rev 10960) +++ branches/osx_newbuildsys/data/glade/vcard_information_window.glade 2009-01-10 21:58:13 UTC (rev 10961) @@ -43,52 +43,80 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkEventBox" id="status_label_eventbox"> + <widget class="GtkLabel" id="label51"> <property name="visible">True</property> - <child> - <widget class="GtkLabel" id="status_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> - </widget> - </child> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Jabber ID:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label53"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Resource:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label54"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Status:</property> + <property name="use_markup">True</property> + </widget> + <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="os_label"> + <widget class="GtkLabel" id="label55"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="wrap">True</property> - <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> + <property name="label" translatable="yes">Client:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label56"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">System:</property> + <property name="use_markup">True</property> + </widget> + <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="client_name_version_label"> + <widget class="GtkLabel" id="jid_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -96,13 +124,10 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> @@ -131,7 +156,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="jid_label"> + <widget class="GtkLabel" id="client_name_version_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -139,86 +164,61 @@ <property name="xpad">5</property> <property name="ypad">5</property> <property name="selectable">True</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label56"> + <widget class="GtkLabel" id="os_label"> <property name="visible">True</property> - <property name="xalign">1</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">System:</property> - <property name="use_markup">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="wrap">True</property> + <property name="selectable">True</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">4</property> <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label55"> + <widget class="GtkEventBox" id="status_label_eventbox"> <property name="visible">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Client:</property> - <property name="use_markup">True</property> + <child> + <widget class="GtkLabel" id="status_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> + </widget> + </child> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label54"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Status:</property> - <property name="use_markup">True</property> - </widget> - <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options">GTK_FILL</property> </packing> </child> - <child> - <widget class="GtkLabel" id="label53"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Resource:</property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label51"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Jabber ID:</property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> </widget> </child> <child> @@ -286,6 +286,10 @@ </packing> </child> </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> </child> <child> <widget class="GtkExpander" id="expander5"> @@ -300,34 +304,26 @@ <property name="column_spacing">12</property> <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="ask_title_label"> + <widget class="GtkEventBox" id="subscription_label_eventbox"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Given Name">Ask:</property> - <property name="use_markup">True</property> + <property name="visible_window">False</property> + <child> + <widget class="GtkLabel" id="subscription_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + </widget> + </child> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="subscription_title_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Family Name">Subscription:</property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> <widget class="GtkEventBox" id="ask_label_eventbox"> <property name="visible">True</property> <property name="visible_window">False</property> @@ -348,25 +344,33 @@ </packing> </child> <child> - <widget class="GtkEventBox" id="subscription_label_eventbox"> + <widget class="GtkLabel" id="subscription_title_label"> <property name="visible">True</property> - <property name="visible_window">False</property> - <child> - <widget class="GtkLabel" id="subscription_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - </widget> - </child> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes" comments="Family Name">Subscription:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> + <child> + <widget class="GtkLabel" id="ask_title_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes" comments="Given Name">Ask:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> </widget> </child> <child> @@ -382,6 +386,8 @@ </child> </widget> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -417,268 +423,128 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="BDAY_label"> + <widget class="GtkExpander" id="expander1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="TEL_HOME_NUMBER_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="EMAIL_HOME_USERID_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="FN_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="NICKNAME_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label57"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">E-Mail:</property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkEventBox" id="eventbox1"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property> <child> - <widget class="GtkLabel" id="label13"> + <widget class="GtkTable" id="table3"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Birthday:</property> - <property name="use_markup">True</property> - </widget> - </child> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label23"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Phone No.:</property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label20"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Nickname:</property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label24"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Name:</property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label22"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Homepage:</property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkExpander" id="expander2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <widget class="GtkTable" id="table_ADR_STREET"> - <property name="visible">True</property> <property name="border_width">6</property> <property name="n_rows">3</property> <property name="n_columns">4</property> - <property name="column_spacing">5</property> - <property name="row_spacing">5</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <widget class="GtkLabel" id="label25"> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <widget class="GtkLabel" id="N_FAMILY_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Country:</property> - <property name="use_markup">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label26"> + <widget class="GtkLabel" id="N_GIVEN_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Postal Code:</property> - <property name="use_markup">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="N_MIDDLE_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label29"> + <widget class="GtkLabel" id="N_PREFIX_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Extra Address:</property> - <property name="use_markup">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label27"> + <widget class="GtkLabel" id="N_SUFFIX_label"> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label18"> + <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> - <property name="label" translatable="yes">State:</property> + <property name="label" translatable="yes" comments="Family Name">Family:</property> <property name="use_markup">True</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label28"> + <widget class="GtkLabel" id="label16"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> - <property name="label" translatable="yes">City:</property> + <property name="label" translatable="yes" comments="Middle Name">Middle:</property> <property name="use_markup">True</property> </widget> <packing> @@ -689,38 +555,88 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label31"> + <widget class="GtkLabel" id="label15"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Street:</property> + <property name="label" translatable="yes" comments="Prefix in Name">Prefix:</property> <property name="use_markup">True</property> </widget> <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_CTRY_label"> + <widget class="GtkLabel" id="label17"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes" comments="Given Name">Given:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label14"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes" comments="Suffix in Name">Suffix:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label19"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Full Name</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkExpander" id="expander2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <widget class="GtkTable" id="table_ADR_STREET"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="n_rows">3</property> + <property name="n_columns">4</property> + <property name="column_spacing">5</property> + <property name="row_spacing">5</property> <child> - <widget class="GtkLabel" id="ADR_HOME_REGION_label"> + <widget class="GtkLabel" id="ADR_HOME_STREET_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -732,13 +648,11 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_PCODE_label"> + <widget class="GtkLabel" id="ADR_HOME_EXTADR_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -750,8 +664,6 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> @@ -774,7 +686,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_EXTADR_label"> + <widget class="GtkLabel" id="ADR_HOME_PCODE_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -786,11 +698,13 @@ <packing> <property name="left_attach">3</property> <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_HOME_STREET_label"> + <widget class="GtkLabel" id="ADR_HOME_REGION_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -802,102 +716,48 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> - </widget> - </child> - <child> - <widget class="GtkLabel" id="label30"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Address</property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="right_attach">4</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkExpander" id="expander1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <widget class="GtkTable" id="table3"> - <property name="visible">True</property> - <property name="border_width">6</property> - <property name="n_rows">3</property> - <property name="n_columns">4</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <widget class="GtkLabel" id="label14"> + <widget class="GtkLabel" id="ADR_HOME_CTRY_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Suffix in Name">Suffix:</property> - <property name="use_markup">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label17"> + <widget class="GtkLabel" id="label31"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Given Name">Given:</property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label15"> - <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Prefix in Name">Prefix:</property> + <property name="label" translatable="yes">Street:</property> <property name="use_markup">True</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label16"> + <widget class="GtkLabel" id="label28"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Middle Name">Middle:</property> + <property name="label" translatable="yes">City:</property> <property name="use_markup">True</property> </widget> <packing> @@ -908,112 +768,77 @@ </packing> </child> <child> - <widget class="GtkLabel" id="label18"> + <widget class="GtkLabel" id="label27"> <property name="visible">True</property> <property name="xalign">1</property> <property name="yalign">0</property> - <property name="label" translatable="yes" comments="Family Name">Family:</property> + <property name="label" translatable="yes">State:</property> <property name="use_markup">True</property> </widget> <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="N_SUFFIX_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="N_PREFIX_label"> + <widget class="GtkLabel" id="label29"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Extra Address:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="N_MIDDLE_label"> + <widget class="GtkLabel" id="label26"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Postal Code:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="N_GIVEN_label"> + <widget class="GtkLabel" id="label25"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Country:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> - <child> - <widget class="GtkLabel" id="N_FAMILY_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> </widget> </child> <child> - <widget class="GtkLabel" id="label19"> + <widget class="GtkLabel" id="label30"> <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Full Name</property> + <property name="label" translatable="yes">Address</property> <property name="use_markup">True</property> </widget> <packing> @@ -1023,11 +848,192 @@ </widget> <packing> <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> + <child> + <widget class="GtkLabel" id="label22"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Homepage:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label24"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Name:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label20"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Nickname:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label23"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Phone No.:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEventBox" id="eventbox1"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes" comments="Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)">Format: YYYY-MM-DD</property> + <child> + <widget class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Birthday:</property> + <property name="use_markup">True</property> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label57"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">E-Mail:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="NICKNAME_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="FN_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="EMAIL_HOME_USERID_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">4</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="TEL_HOME_NUMBER_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="BDAY_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="y_options"></property> + </packing> + </child> </widget> <packing> <property name="position">1</property> @@ -1061,98 +1067,80 @@ <placeholder/> </child> <child> - <widget class="GtkLabel" id="label33"> + <widget class="GtkLabel" id="ORG_ORGNAME_label"> <property name="visible">True</property> - <property name="xalign">1</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Phone No.:</property> - <property name="use_markup">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> </widget> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label32"> + <widget class="GtkLabel" id="ORG_ORGUNIT_label"> <property name="visible">True</property> - <property name="xalign">1</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">E-Mail:</property> - <property name="use_markup">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label41"> + <widget class="GtkLabel" id="TITLE_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Role:</property> - <property name="use_markup">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label43"> + <widget class="GtkLabel" id="ROLE_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Department:</property> - <property name="use_markup">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label42"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Position:</property> - <property name="use_markup">True</property> - </widget> - <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label44"> + <widget class="GtkLabel" id="EMAIL_WORK_USERID_label"> <property name="visible">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Company:</property> - <property name="use_markup">True</property> - </widget> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="TEL_WORK_NUMBER_label"> - <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> @@ -1162,9 +1150,9 @@ </widget> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="right_attach">4</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> @@ -1181,95 +1169,88 @@ <property name="column_spacing">5</property> <property name="row_spacing">5</property> <child> - <widget class="GtkLabel" id="label34"> + <widget class="GtkLabel" id="ADR_WORK_STREET_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Country:</property> - <property name="use_markup">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label35"> + <widget class="GtkLabel" id="ADR_WORK_EXTADR_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Postal Code:</property> - <property name="use_markup">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label38"> + <widget class="GtkLabel" id="ADR_WORK_LOCALITY_label"> <property name="visible">True</property> + <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Extra Address:</property> - <property name="use_markup">True</property> - <property name="single_line_mode">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label36"> + <widget class="GtkLabel" id="ADR_WORK_PCODE_label"> <property name="visible">True</property> - <property name="xalign">1</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">State:</property> - <property name="use_markup">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label37"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">City:</property> - <property name="use_markup">True</property> - </widget> - <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label39"> + <widget class="GtkLabel" id="ADR_WORK_REGION_label"> <property name="visible">True</property> - <property name="xalign">1</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">Street:</property> - <property name="use_markup">True</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + <property name="selectable">True</property> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="y_options"></property> </packing> </child> @@ -1292,88 +1273,95 @@ </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_REGION_label"> + <widget class="GtkLabel" id="label39"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Street:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_PCODE_label"> + <widget class="GtkLabel" id="label37"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">City:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_LOCALITY_label"> + <widget class="GtkLabel" id="label36"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">State:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label38"> + <property name="visible">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Extra Address:</property> + <property name="use_markup">True</property> + <property name="single_line_mode">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_EXTADR_label"> + <widget class="GtkLabel" id="label35"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Postal Code:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ADR_WORK_STREET_label"> + <widget class="GtkLabel" id="label34"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> + <property name="label" translatable="yes">Country:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> @@ -1400,7 +1388,7 @@ </packing> </child> <child> - <widget class="GtkLabel" id="EMAIL_WORK_USERID_label"> + <widget class="GtkLabel" id="TEL_WORK_NUMBER_label"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="xalign">0</property> @@ -1411,81 +1399,99 @@ </widget> <packing> <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ROLE_label"> + <widget class="GtkLabel" id="label44"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> + <property name="label" translatable="yes">Company:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label42"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Position:</property> + <property name="use_markup">True</property> + </widget> + <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="TITLE_label"> + <widget class="GtkLabel" id="label43"> <property name="visible">True</property> - <property name="can_focus">True</property> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> + <property name="label" translatable="yes">Department:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label41"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Role:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ORG_ORGUNIT_label"> + <widget class="GtkLabel" id="label32"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> + <property name="label" translatable="yes">E-Mail:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="ORG_ORGNAME_label"> + <widget class="GtkLabel" id="label33"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="xalign">0</property> + <property name="xalign">1</property> <property name="yalign">0</property> - <property name="xpad">5</property> - <property name="ypad">5</property> - <property name="selectable">True</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> + <property name="label" translatable="yes">Phone No.:</property> + <property name="use_markup">True</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> Modified: branches/osx_newbuildsys/src/common/Makefile =================================================================== --- branches/osx_newbuildsys/src/common/Makefile 2009-01-10 21:56:21 UTC (rev 10960) +++ branches/osx_newbuildsys/src/common/Makefile 2009-01-10 21:58:13 UTC (rev 10961) @@ -26,6 +26,7 @@ helpers.py \ i18n.py \ idle.py \ + latex.py \ logger.py \ optparser.py \ passwords.py \ Modified: branches/osx_newbuildsys/src/common/exceptions.py =================================================================== --- branches/osx_newbuildsys/src/common/exceptions.py 2009-01-10 21:56:21 UTC (rev 10960) +++ branches/osx_newbuildsys/src/common/exceptions.py 2009-01-10 21:58:13 UTC (rev 10961) @@ -83,7 +83,7 @@ pass class LatexError(Exception): - '''sqlite2 raised pysqlite2.dbapi2.OperationalError''' + '''LaTeX processing failed for some reason''' def __init__(self, text=''): Exception.__init__(self) self.text = text Modified: branches/osx_newbuildsys/src/common/gajim.py =================================================================== --- branches/osx_newbuildsys/src/common/gajim.py 2009-01-10 21:56:21 UTC (rev 10960) +++ branches/osx_newbuildsys/src/common/gajim.py 2009-01-10 21:58:13 UTC (rev 10961) @@ -176,6 +176,9 @@ if system('gpg -h >/dev/null 2>&1'): HAVE_GPG = False +import latex +HAVE_LATEX = latex.check_for_latex_support() + gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'} gajim_common_features = [xmpp.NS_BYTESTREAM, xmpp.NS_SI, xmpp.NS_FILE, xmpp.NS_MUC, xmpp.NS_MUC_USER, xmpp.NS_MUC_ADMIN, xmpp.NS_MUC_OWNER, Copied: branches/osx_newbuildsys/src/common/latex.py (from rev 10950, trunk/src/common/latex.py) =================================================================== --- branches/osx_newbuildsys/src/common/latex.py (rev 0) +++ branches/osx_newbuildsys/src/common/latex.py 2009-01-10 21:58:13 UTC (rev 10961) @@ -0,0 +1,148 @@ +# -*- coding:utf-8 -*- +## src/common/latex.py +## +## Copyright (C) 2005 Norman Rasmussen <norman AT rasmussen.co.za> +## Copyright (C) 2005-2006 Alex Mauer <hawke AT hawkesnest.net> +## Travis Shirk <travis AT pobox.com> +## Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2005-2008 Yann Leboulanger <asterix AT lagaule.org> +## Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> +## Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> +## Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> +## Julien Pivotto <roidelapluie AT gmail.com> +## Stephan Erb <steve-e AT h3c.de> +## +## 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 os +import random +from tempfile import gettempdir +from subprocess import Popen + +import gajim +from exceptions import LatexError + +# some latex commands are really bad +blacklist = ['\\def', '\\let', '\\futurelet', + '\\newcommand', '\\renewcomment', '\\else', '\\fi', '\\write', + '\\input', '\\include', '\\chardef', '\\catcode', '\\makeatletter', + '\\noexpand', '\\toksdef', '\\every', '\\errhelp', '\\errorstopmode', + '\\scrollmode', '\\nonstopmode', '\\batchmode', '\\read', '\\csname', + '\\newhelp', '\\relax', '\\afterground', '\\afterassignment', + '\\expandafter', '\\noexpand', '\\special', '\\command', '\\loop', + '\\repeat', '\\toks', '\\output', '\\line', '\\mathcode', '\\name', + '\\item', '\\section', '\\mbox', '\\DeclareRobustCommand', '\\[', + '\\]'] +# True if the string matches the blacklist +def check_blacklist(str_): + for word in blacklist: + if word in str_: + return True + return False + +def get_tmpfile_name(): + random.seed() + int_ = random.randint(0, 100) + return os.path.join(gettempdir(), 'gajimtex_' + int_.__str__()) + +def write_latex(filename, str_): + texstr = '\\documentclass[12pt]{article}\\usepackage[dvips]{graphicx}' + texstr += '\\usepackage{amsmath}\\usepackage{amssymb}' + texstr += '\\pagestyle{empty}' + texstr += '\\begin{document}\\begin{large}\\begin{gather*}' + texstr += str_ + texstr += '\\end{gather*}\\end{large}\\end{document}' + + file_ = open(filename, "w+") + file_.write(texstr) + file_.flush() + file_.close() + +# a wrapper for Popen so that no window gets opened on Windows +def popen_nt_friendly(command): + if os.name == 'nt': + # CREATE_NO_WINDOW + return Popen(command, creationflags=0x08000000, cwd=gettempdir()) + else: + return Popen(command, cwd=gettempdir()) + +def check_for_latex_support(): + '''check is latex is available and if it can create a picture.''' + + try: + filename = latex_to_image("test") + if filename: + # we have a file, conversion succeeded + os.remove(filename) + return True + return False + except LatexError: + return False + +def latex_to_image(str_): + result = None + exitcode = 0 + + # filter latex code with bad commands + if check_blacklist(str_): + # we triggered the blacklist, immediately return None + return None + + tmpfile = get_tmpfile_name() + + # build latex string + write_latex(os.path.join(tmpfile + '.tex'), str_) + + # convert TeX to dvi + try: + p = popen_nt_friendly(['latex', '--interaction=nonstopmode', + tmpfile + '.tex']) + exitcode = p.wait() + except Exception, e: + exitcode = _('Error executing "%(command)s": %(error)s') % { + 'command': 'latex --interaction=nonstopmode %s.tex' % tmpfile, + 'error': str(e)} + + if exitcode == 0: + # convert dvi to png + latex_png_dpi = gajim.config.get('latex_png_dpi') + try: + p = popen_nt_friendly(['dvipng', '-bg', 'rgb 1.0 1.0 1.0', '-T', + 'tight', '-D', latex_png_dpi, tmpfile + '.dvi', '-o', + tmpfile + '.png']) + exitcode = p.wait() + except Exception, e: + exitcode = _('Error executing "%(command)s": %(error)s') % { + 'command': 'dvipng -bg rgb 1.0 1.0 1.0 -T tight -D %s %s.dvi -o ' + '%s.png' % (latex_png_dpi, tmpfile, tmpfile), 'error': str(e)} + + # remove temp files created by us and TeX + extensions = ['.tex', '.log', '.aux', '.dvi'] + for ext in extensions: + try: + os.remove(tmpfile + ext) + except Exception: + pass + + if isinstance(exitcode, (unicode, str)): + raise LatexError(exitcode) + + if exitcode == 0: + result = tmpfile + '.png' + + return result + +# vim: se ts=3: Modified: branches/osx_newbuildsys/src/conversation_textview.py =================================================================== --- branches/osx_newbuildsys/src/conversation_textview.py 2009-01-10 21:56:21 UTC (rev 10960) +++ branches/osx_newbuildsys/src/conversation_textview.py 2009-01-10 21:58:13 UTC (rev 10961) @@ -27,9 +27,6 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import random -from tempfile import gettempdir -from subprocess import Popen from threading import Timer # for smooth scrolling import gtk @@ -45,6 +42,7 @@ import gtkgui_helpers from common import gajim from common import helpers +from common import latex from calendar import timegm from common.fuzzyclock import FuzzyClock @@ -959,95 +957,6 @@ return index # the position after *last* special text - def latex_to_image(self, str_): - result = None - exitcode = 0 - - # some latex commands are really bad - blacklist = ['\\def', '\\let', '\\futurelet', - '\\newcommand', '\\renewcomment', '\\else', '\\fi', '\\write', - '\\input', '\\include', '\\chardef', '\\catcode', '\\makeatletter', - '\\noexpand', '\\toksdef', '\\every', '\\errhelp', '\\errorstopmode', - '\\scrollmode', '\\nonstopmode', '\\batchmode', '\\read', '\\csname', - '\\newhelp', '\\relax', '\\afterground', '\\afterassignment', - '\\expandafter', '\\noexpand', '\\special', '\\command', '\\loop', - '\\repeat', '\\toks', '\\output', '\\line', '\\mathcode', '\\name', - '\\item', '\\section', '\\mbox', '\\DeclareRobustCommand', '\\[', - '\\]'] - - str_ = str_[2:len(str_)-2] - - # filter latex code with bad commands - for word in blacklist: - if word in str_: - exitcode = 1 - break - - if exitcode == 0: - random.seed() - tmpfile = os.path.join(gettempdir(), 'gajimtex_' + random.randint(0, - 100).__str__()) - - # build latex string - texstr = '\\documentclass[12pt]{article}\\usepackage[dvips]{graphicx}' - texstr += '\\usepackage{amsmath}\\usepackage{amssymb}' - texstr += '\\pagestyle{empty}' - texstr += '\\begin{document}\\begin{large}\\begin{gather*}' - texstr += str_ - texstr += '\\end{gather*}\\end{large}\\end{document}' - - file_ = open(os.path.join(tmpfile + '.tex'), 'w+') - file_.write(texstr) - file_.flush() - file_.close() - - try: - if os.name == 'nt': - # CREATE_NO_WINDOW - p = Popen(['latex', '--interaction=nonstopmode', - tmpfile + '.tex'], creationflags=0x08000000, cwd=gettempdir()) - else: - p = Popen(['latex', '--interaction=nonstopmode', - tmpfile + '.tex'], cwd=gettempdir()) - exitcode = p.wait() - except Exception, e: - exitcode = _('Error executing "%(command)s": %(error)s') % { - 'command': 'latex --interaction=nonstopmode %s.tex' % tmpfile, - 'error': str(e)} - - if exitcode == 0: - latex_png_dpi = gajim.config.get('latex_png_dpi') - try: - if os.name == 'nt': - # CREATE_NO_WINDOW - p = Popen(['dvipng', '-bg', 'rgb 1.0 1.0 1.0', '-T', 'tight', - '-D', latex_png_dpi, tmpfile + '.dvi', '-o', - tmpfile + '.png'], creationflags=0x08000000, cwd=gettempdir()) - else: - p = Popen(['dvipng', '-bg', 'rgb 1.0 1.0 1.0', '-T', 'tight', - '-D', latex_png_dpi, tmpfile + '.dvi', '-o', - tmpfile + '.png'], cwd=gettempdir()) - exitcode = p.wait() - except Exception, e: - exitcode = _('Error executing "%(command)s": %(error)s') % { - 'command': 'dvipng -bg rgb 1.0 1.0 1.0 -T tight -D %s %s.dvi -o ' - '%s.png' % (latex_png_dpi, tmpfile, tmpfile), 'error': str(e)} - - extensions = ['.tex', '.log', '.aux', '.dvi'] - for ext in extensions: - try: - os.remove(tmpfile + ext) - except Exception: - pass - - if isinstance(exitcode, (unicode, str)): - raise LatexError(exitcode) - - if exitcode == 0: - result = tmpfile + '.png' - - return result - def print_special_text(self, special_text, other_tags): '''is called by detect_and_print_special_text and prints special text (emots, links, formatting)''' @@ -1141,9 +1050,10 @@ else: if not show_ascii_formatting_chars: special_text = special_text[1:-1] # remove _ _ - elif special_text.startswith('$$') and special_text.endswith('$$'): + elif gajim.HAVE_LATEX and special_text.startswith('$$') and \ + special_text.endswith('$$'): try: - imagepath = self.latex_to_image(special_text) + imagepath = latex.latex_to_image(special_text[2:-2]) except LatexError, e: # print the error after the line has been written gobject.idle_add(self.print_conversation_line, str(e), '', 'info', Modified: branches/osx_newbuildsys/src/features_window.py =================================================================== --- branches/osx_newbuildsys/src/features_window.py 2009-01-10 21:56:21 UTC (rev 10960) +++ branches/osx_newbuildsys/src/features_window.py 2009-01-10 21:58:13 UTC (rev 10961) @@ -31,10 +31,6 @@ from common import gajim from common import helpers -import random -from tempfile import gettempdir -from subprocess import Popen - class FeaturesWindow: '''Class for features window''' @@ -255,57 +251,8 @@ return sleepy.SUPPORTED def latex_available(self): - '''check is latex is available and if it can create a picture.''' + return gajim.HAVE_LATEX - exitcode = 0 - random.seed() - tmpfile = os.path.join(gettempdir(), "gajimtex_" + \ - random.randint(0,100).__str__()) - - # build latex string - texstr = '\\documentclass[12pt]{article}\\usepackage[dvips]{graphicx}' - texstr += '\\usepackage{amsmath}\\usepackage{amssymb}\\pagestyle{empty}' - texstr += '\\begin{document}\\begin{large}\\begin{gather*}test' - texstr += '\\end{gather*}\\end{large}\\end{document}' - - file_ = open(os.path.join(tmpfile + ".tex"), "w+") - file_.write(texstr) - file_.flush() - file_.close() - try: - if os.name == 'nt': - # CREATE_NO_WINDOW - p = Popen(['latex', '--interaction=nonstopmode', tmpfile + '.tex'], - creationflags=0x08000000, cwd=gettempdir()) - else: - p = Popen(['latex', '--interaction=nonstopmode', tmpfile + '.tex'], - cwd=gettempdir()) - exitcode = p.wait() - except Exception: - exitcode = 1 - if exitcode == 0: - try: - if os.name == 'nt': - # CREATE_NO_WINDOW - p = Popen(['dvipng', '-bg', 'white', '-T', 'tight', - tmpfile + '.dvi', '-o', tmpfile + '.png'], - creationflags=0x08000000, cwd=gettempdir()) - else: - p = Popen(['dvipng', '-bg', 'white', '-T', 'tight', - tmpfile + '.dvi', '-o', tmpfile + '.png'], cwd=gettempdir()) - exitcode = p.wait() - except Exception: - exitcode = 1 - extensions = ['.tex', '.log', '.aux', '.dvi', '.png'] - for ext in extensions: - try: - os.remove(tmpfile + ext) - except Exception: - pass - if exitcode == 0: - return True - return False - def pycrypto_available(self): return gajim.HAVE_PYCRYPTO Modified: branches/osx_newbuildsys/src/roster_window.py =================================================================== --- branches/osx_newbuildsys/src/roster_window.py 2009-01-10 21:56:21 UTC (rev 10960) +++ branches/osx_newbuildsys/src/roster_window.py 2009-01-10 21:58:13 UTC (rev 10961) @@ -1959,7 +1959,7 @@ self.send_status_continue(account, status, txt, auto, to) def send_status_continue(self, account, status, txt, auto, to): - if gajim.account_is_connected(account): + if gajim.account_is_connected(account) and not to: if status == 'online' and gajim.interface.sleeper.getState() != \ common.sleepy.STATE_UNKNOWN: gajim.sleeper_state[account] = 'online' Modified: branches/osx_newbuildsys/src/secrets.py =================================================================== --- branches/osx_newbuildsys/src/secrets.py 2009-01-10 21:56:21 UTC (rev 10960) +++ branches/osx_newbuildsys/src/secrets.py 2009-01-10 21:58:13 UTC (rev 10961) @@ -42,10 +42,8 @@ raise exceptions.Cancelled def save(self): - pickle.dumps(self) - f = open(secrets_filename, 'w') - f.write(pickle.dumps(self)) + pickle.dump(self, f) f.close() def retained_secrets(self, account, bare_jid): @@ -100,7 +98,7 @@ f = open(filename, 'r') try: - secrets = pickle.loads(f.read()) + secrets = pickle.load(f) except KeyError: f.close() secrets = Secrets(filename)

1 0

[commit-gajim] r10960 - in branches/osx_newbuildsys/src: . common common/xmpp common/zeroconf
by js＠gajim.org 10 Jan '09

10 Jan '09

Author: js Date: 2009-01-10 22:56:21 +0100 (Sat, 10 Jan 2009) New Revision: 10960 Added: branches/osx_newbuildsys/src/common/xmpp/plugin.py Removed: branches/osx_newbuildsys/src/common/xmpp/client.py Modified: branches/osx_newbuildsys/src/common/connection_handlers.py branches/osx_newbuildsys/src/common/helpers.py branches/osx_newbuildsys/src/common/socks5.py branches/osx_newbuildsys/src/common/xmpp/Makefile branches/osx_newbuildsys/src/common/xmpp/__init__.py branches/osx_newbuildsys/src/common/xmpp/auth_nb.py branches/osx_newbuildsys/src/common/xmpp/bosh.py branches/osx_newbuildsys/src/common/xmpp/c14n.py branches/osx_newbuildsys/src/common/xmpp/client_nb.py branches/osx_newbuildsys/src/common/xmpp/dispatcher_nb.py branches/osx_newbuildsys/src/common/xmpp/proxy_connectors.py branches/osx_newbuildsys/src/common/xmpp/roster_nb.py branches/osx_newbuildsys/src/common/xmpp/tls_nb.py branches/osx_newbuildsys/src/common/xmpp/transports_nb.py branches/osx_newbuildsys/src/common/zeroconf/client_zeroconf.py branches/osx_newbuildsys/src/conversation_textview.py branches/osx_newbuildsys/src/roster_window.py Log: Merge trunk r10945. Rest follows later. Modified: branches/osx_newbuildsys/src/common/connection_handlers.py =================================================================== --- branches/osx_newbuildsys/src/common/connection_handlers.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/connection_handlers.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -30,10 +30,10 @@ import os import base64 -import sha import socket import sys import operator +import hashlib from time import (altzone, daylight, gmtime, localtime, mktime, strftime, time as time_time, timezone, tzname) @@ -1049,7 +1049,7 @@ photo = vcard['PHOTO']['BINVAL'] photo_decoded = base64.decodestring(photo) gajim.interface.save_avatar_files(our_jid, photo_decoded) - avatar_sha = sha.sha(photo_decoded).hexdigest() + avatar_sha = hashlib.sha1(photo_decoded).hexdigest() iq2.getTag('PHOTO').setTagData('SHA', avatar_sha) else: gajim.interface.remove_avatar_files(our_jid) @@ -1205,7 +1205,7 @@ photo = vcard['PHOTO']['BINVAL'] try: photo_decoded = base64.decodestring(photo) - avatar_sha = sha.sha(photo_decoded).hexdigest() + avatar_sha = hashlib.sha1(photo_decoded).hexdigest() except Exception: avatar_sha = '' else: Modified: branches/osx_newbuildsys/src/common/helpers.py =================================================================== --- branches/osx_newbuildsys/src/common/helpers.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/helpers.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -38,6 +38,8 @@ import select import base64 import sys +import hashlib + from encodings.punycode import punycode_encode import gajim @@ -46,18 +48,6 @@ import xmpp try: - # Python 2.5 - import hashlib - hash_md5 = hashlib.md5 - hash_sha1 = hashlib.sha1 -except ImportError: - # Python 2.4 - import md5 - import sha - hash_md5 = md5.new - hash_sha1 = sha.new - -try: from osx import nsapp except ImportError: pass @@ -731,7 +721,7 @@ def get_auth_sha(sid, initiator, target): ''' return sha of sid + initiator + target used for proxy auth''' - return hash_sha1("%s%s%s" % (sid, initiator, target)).hexdigest() + return hashlib.sha1("%s%s%s" % (sid, initiator, target)).hexdigest() distro_info = { @@ -847,7 +837,7 @@ latin characters, and is not too long (in that case hash it)''' # 48 is the limit if len(filename) > 48: - hash = hash_md5(filename) + hash = hashlib.md5(filename) filename = base64.b64encode(hash.digest()) filename = punycode_encode(filename) # make it latin chars only @@ -1250,9 +1240,9 @@ S += '%s<' % value if hash_method == 'sha-1': - hash_ = hash_sha1(S) + hash_ = hashlib.sha1(S) elif hash_method == 'md5': - hash_ = hash_md5(S) + hash_ = hashlib.md5(S) else: return '' return base64.b64encode(hash_.digest()) Modified: branches/osx_newbuildsys/src/common/socks5.py =================================================================== --- branches/osx_newbuildsys/src/common/socks5.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/socks5.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -25,7 +25,7 @@ import os import socket import struct -import sha +import hashlib import os from errno import EWOULDBLOCK @@ -645,9 +645,10 @@ ''' get sha of sid + Initiator jid + Target jid ''' if 'is_a_proxy' in self.file_props: del(self.file_props['is_a_proxy']) - return sha.new('%s%s%s' % (self.sid, self.file_props['proxy_sender'], + return hashlib.sha1('%s%s%s' % (self.sid, + self.file_props['proxy_sender'], self.file_props['proxy_receiver'])).hexdigest() - return sha.new('%s%s%s' % (self.sid, self.initiator, self.target)).\ + return hashlib.sha1('%s%s%s' % (self.sid, self.initiator, self.target)).\ hexdigest() class Socks5Sender(Socks5, IdleObject): Modified: branches/osx_newbuildsys/src/common/xmpp/Makefile =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/Makefile 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/xmpp/Makefile 2009-01-10 21:56:21 UTC (rev 10960) @@ -2,11 +2,11 @@ auth_nb.py \ bosh.py \ c14n.py \ - client.py \ client_nb.py \ dispatcher_nb.py \ features_nb.py \ idlequeue.py \ + plugin.py \ protocol.py \ proxy_connectors.py \ roster_nb.py \ Modified: branches/osx_newbuildsys/src/common/xmpp/__init__.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/__init__.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/xmpp/__init__.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -13,7 +13,7 @@ import simplexml, protocol, auth_nb, transports_nb, roster_nb import dispatcher_nb, features_nb, idlequeue, bosh, tls_nb, proxy_connectors from client_nb import NonBlockingClient -from client import PlugIn +from plugin import PlugIn from protocol import * # vim: se ts=3: Modified: branches/osx_newbuildsys/src/common/xmpp/auth_nb.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/auth_nb.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/xmpp/auth_nb.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -21,19 +21,18 @@ ''' from protocol import NS_SASL, NS_SESSION, NS_STREAMS, NS_BIND, NS_AUTH from protocol import Node, NodeProcessed, isResultNode, Iq, Protocol, JID -from client import PlugIn -import sha +from plugin import PlugIn import base64 import random import itertools import dispatcher_nb -import md5 +import hashlib import logging log = logging.getLogger('gajim.c.x.auth_nb') -def HH(some): return md5.new(some).hexdigest() -def H(some): return md5.new(some).digest() +def HH(some): return hashlib.md5(some).hexdigest() +def H(some): return hashlib.md5(some).digest() def C(some): return ':'.join(some) try: @@ -128,7 +127,7 @@ self.password = password self.on_sasl = on_sasl self.realm = None - + def plugin(self, owner): if 'version' not in self._owner.Dispatcher.Stream._document_attrs: self.startsasl = SASL_UNSUPPORTED @@ -256,8 +255,8 @@ # Openfire) old_features = self._owner.Dispatcher.Stream.features self._owner.Dispatcher.PlugOut() - dispatcher_nb.Dispatcher().PlugIn(self._owner, after_SASL=True, - old_features=old_features) + dispatcher_nb.Dispatcher.get_instance().PlugIn(self._owner, + after_SASL=True, old_features=old_features) self._owner.Dispatcher.restoreHandlers(handlers) self._owner.User = self.username @@ -372,8 +371,8 @@ if query.getTag('digest'): log.info("Performing digest authentication") query.setTagData('digest', - sha.new(self.owner.Dispatcher.Stream._document_attrs['id'] + - self.password).hexdigest()) + hashlib.sha1(self.owner.Dispatcher.Stream._document_attrs['id'] + + self.password).hexdigest()) if query.getTag('password'): query.delChild('password') self._method = 'digest' @@ -383,7 +382,7 @@ log.info("Performing zero-k authentication") def hasher(s): - return sha.new(s).hexdigest() + return hashlib.sha1(s).hexdigest() def hash_n_times(s, count): return count and hasher(hash_n_times(s, count-1)) or s Modified: branches/osx_newbuildsys/src/common/xmpp/bosh.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/bosh.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/xmpp/bosh.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -18,7 +18,8 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import locale, random, sha +import locale, random +from hashlib import sha1 from transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ CONNECTED, CONNECTING, DISCONNECTED, DISCONNECTING,\ urisplit, DISCONNECT_TIMEOUT_SECONDS @@ -527,10 +528,10 @@ def reset(self): seed = str(get_rand_number()) - self.keys = [sha.new(seed).hexdigest()] + self.keys = [sha1(seed).hexdigest()] for i in range(self.count-1): curr_seed = self.keys[i] - self.keys.append(sha.new(curr_seed).hexdigest()) + self.keys.append(sha1(curr_seed).hexdigest()) def get(self): if self.first_call: Modified: branches/osx_newbuildsys/src/common/xmpp/c14n.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/c14n.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/xmpp/c14n.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -1,6 +1,5 @@ -''' XML canonicalisation methods (for XEP-0116) ''' # -*- coding:utf-8 -*- -## src/common/stanza_session.py +## c14n.py ## ## Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> ## @@ -18,6 +17,8 @@ ## You should have received a copy of the GNU General Public License ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## + +''' XML canonicalisation methods (for XEP-0116) ''' from simplexml import ustr def c14n(node): Deleted: branches/osx_newbuildsys/src/common/xmpp/client.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/client.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/xmpp/client.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -1,86 +0,0 @@ -## client.py -## -## Copyright (C) 2003-2005 Alexey "Snake" Nezhdanov -## -## 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 -## the Free Software Foundation; either version 2, or (at your option) -## any later version. -## -## This program 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. - -# $Id: client.py,v 1.52 2006/01/02 19:40:55 normanr Exp $ - -''' -Provides PlugIn class functionality to develop extentions for xmpppy. -''' - -import logging -log = logging.getLogger('gajim.c.x.plugin') - -class PlugIn: - ''' - Abstract xmpppy plugin infrastructure code, providing plugging in/out and - debugging functionality. - - Inherit to develop pluggable objects. No code change on the owner class - required (the object where we plug into) - - For every instance of PlugIn class the 'owner' is the class in what the plug - was plugged. - ''' - def __init__(self): - self._exported_methods=[] - - def PlugIn(self, owner): - ''' - Attach to owner and register ourself and our _exported_methods in it. - If defined by a subclass, call self.plugin(owner) to execute hook - code after plugging. - ''' - self._owner=owner - log.info('Plugging %s __INTO__ %s' % (self, self._owner)) - if self.__class__.__name__ in owner.__dict__: - log.debug('Plugging ignored: another instance already plugged.') - return - self._old_owners_methods=[] - for method in self._exported_methods: - if method.__name__ in owner.__dict__: - self._old_owners_methods.append(owner.__dict__[method.__name__]) - owner.__dict__[method.__name__]=method - if self.__class__.__name__.endswith('Dispatcher'): - # FIXME: I need BOSHDispatcher or XMPPDispatcher on .Dispatcher - # there must be a better way.. - owner.__dict__['Dispatcher']=self - else: - owner.__dict__[self.__class__.__name__]=self - - # Execute hook - if hasattr(self,'plugin'): - return self.plugin(owner) - - def PlugOut(self): - ''' - Unregister our _exported_methods from owner and detach from it. - If defined by a subclass, call self.plugout() after unplugging to execute - hook code. - ''' - log.info('Plugging %s __OUT__ of %s.' % (self, self._owner)) - for method in self._exported_methods: - del self._owner.__dict__[method.__name__] - for method in self._old_owners_methods: - self._owner.__dict__[method.__name__]=method - # FIXME: Dispatcher workaround - if self.__class__.__name__.endswith('Dispatcher'): - del self._owner.__dict__['Dispatcher'] - else: - del self._owner.__dict__[self.__class__.__name__] - # Execute hook - if hasattr(self,'plugout'): - return self.plugout() - del self._owner - -# vim: se ts=3: Modified: branches/osx_newbuildsys/src/common/xmpp/client_nb.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/client_nb.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/xmpp/client_nb.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -1,6 +1,5 @@ ## client_nb.py ## based on client.py, changes backported up to revision 1.60 - ## ## Copyright (C) 2003-2005 Alexey "Snake" Nezhdanov ## modified by Dimitur Kirov <dkirov(a)gmail.com> @@ -21,9 +20,7 @@ Client class establishs connection to XMPP Server and handles authentication ''' import socket - import transports_nb, dispatcher_nb, auth_nb, roster_nb, protocol, bosh - from protocol import NS_TLS import logging @@ -120,7 +117,7 @@ if not stream_started: # if error occur before XML stream was opened, e.g. no response on # init request, we call the on_connect_failure callback because - # proper connection is not estabilished yet and it's not a proxy + # proper connection is not established yet and it's not a proxy # issue log.debug('calling on_connect_failure cb') self.on_connect_failure() @@ -146,15 +143,15 @@ values for keys 'host' and 'port' - connection details for proxy serve and optionally keys 'user' and 'pass' as proxy credentials :param secure_tuple: tuple of (desired connection type, cacerts, mycerts) - connection type can be 'ssl' - TLS estabilished after TCP connection, - 'tls' - TLS estabilished after negotiation with starttls, or 'plain'. + connection type can be 'ssl' - TLS established after TCP connection, + 'tls' - TLS established after negotiation with starttls, or 'plain'. cacerts, mycerts - see tls_nb.NonBlockingTLS constructor for more details ''' self.on_connect = on_connect self.on_connect_failure=on_connect_failure self.on_proxy_failure = on_proxy_failure - self.secure, self.cacerts, self.mycerts = secure_tuple + self.desired_security, self.cacerts, self.mycerts = secure_tuple self.Connection = None self.Port = port self.proxy = proxy @@ -163,8 +160,12 @@ self.xmpp_hostname = hostname else: self.xmpp_hostname = self.Server - - estabilish_tls = self.secure == 'ssl' + + # We only check for SSL here as for TLS we will first have to start a + # PLAIN connection and negotiate TLS afterwards. + # establish_tls will instruct transport to start secure connection + # directly + establish_tls = self.desired_security == 'ssl' certs = (self.cacerts, self.mycerts) proxy_dict = {} @@ -181,16 +182,16 @@ if proxy['type'] == 'bosh': # Setup BOSH transport - self.socket = bosh.NonBlockingBOSH( - on_disconnect = self.disconnect, - raise_event = self.raise_event, - idlequeue = self.idlequeue, - estabilish_tls = estabilish_tls, - certs = certs, - proxy_creds = (proxy_user, proxy_pass), - xmpp_server = (self.xmpp_hostname, self.Port), - domain = self.Server, - bosh_dict = proxy) + self.socket = bosh.NonBlockingBOSH.get_instance( + on_disconnect=self.disconnect, + raise_event=self.raise_event, + idlequeue=self.idlequeue, + estabilish_tls=establish_tls, + certs=certs, + proxy_creds=(proxy_user, proxy_pass), + xmpp_server=(self.xmpp_hostname, self.Port), + domain=self.Server, + bosh_dict=proxy) self.protocol_type = 'BOSH' self.wait_for_restart_response = \ proxy['bosh_wait_for_restart_response'] @@ -202,13 +203,13 @@ if not proxy or proxy['type'] != 'bosh': # Setup ordinary TCP transport - self.socket = transports_nb.NonBlockingTCP( - on_disconnect = self.disconnect, - raise_event = self.raise_event, - idlequeue = self.idlequeue, - estabilish_tls = estabilish_tls, - certs = certs, - proxy_dict = proxy_dict) + self.socket = transports_nb.NonBlockingTCP.get_instance( + on_disconnect=self.disconnect, + raise_event=self.raise_event, + idlequeue=self.idlequeue, + estabilish_tls=establish_tls, + certs=certs, + proxy_dict=proxy_dict) # plug transport into client as self.Connection self.socket.PlugIn(self) @@ -221,8 +222,8 @@ def _resolve_hostname(self, hostname, port, on_success): ''' wrapper for getaddinfo call. FIXME: getaddinfo blocks''' try: - self.ip_addresses = socket.getaddrinfo(hostname,port, - socket.AF_UNSPEC,socket.SOCK_STREAM) + self.ip_addresses = socket.getaddrinfo(hostname, port, + socket.AF_UNSPEC, socket.SOCK_STREAM) except socket.gaierror, (errnum, errstr): self.disconnect(message='Lookup failure for %s:%s, hostname: %s - %s' % (self.Server, self.Port, hostname, errstr)) @@ -241,7 +242,7 @@ self.current_ip = self.ip_addresses.pop(0) self.socket.connect( conn_5tuple=self.current_ip, - on_connect=lambda: self._xmpp_connect(socket_type='plain'), + on_connect=lambda: self._xmpp_connect(), on_connect_failure=self._try_next_ip) def incoming_stream_version(self): @@ -251,14 +252,20 @@ else: return None - def _xmpp_connect(self, socket_type): + def _xmpp_connect(self, socket_type=None): ''' Starts XMPP connecting process - opens the XML stream. Is called after TCP - connection is estabilished or after switch to TLS when successfully + connection is established or after switch to TLS when successfully negotiated with <starttls>. ''' - if socket_type == 'plain' and self.Connection.ssl_lib: - socket_type = 'ssl' + # socket_type contains info which transport connection was established + if not socket_type: + if self.Connection.ssl_lib: + # When ssl_lib is set we connected via SSL + socket_type = 'ssl' + else: + # PLAIN is default + socket_type = 'plain' self.connected = socket_type self._xmpp_connect_machine() @@ -287,7 +294,7 @@ if self.__dict__.has_key('Dispatcher'): self.Dispatcher.PlugOut() self.got_features = False - d = dispatcher_nb.Dispatcher().PlugIn(self) + dispatcher_nb.Dispatcher.get_instance().PlugIn(self) on_next_receive('RECEIVE_DOCUMENT_ATTRIBUTES') elif mode == 'FAILURE': @@ -307,7 +314,6 @@ else: log.info('got STREAM FEATURES in first recv') self._xmpp_connect_machine(mode='STREAM_STARTED') - else: log.info('incoming stream version less than 1.0') self._xmpp_connect_machine(mode='STREAM_STARTED') @@ -330,32 +336,35 @@ def _on_stream_start(self): ''' - Called after XMPP stream is opened. - TLS negotiation may follow when stream is established. + Called after XMPP stream is opened. TLS negotiation may follow if + supported and desired. ''' self.stream_started = True self.onreceive(None) + if self.connected == 'plain': - if self.secure == 'plain': - # if we want plain connection, we're done now + if self.desired_security == 'plain': + # if we want and have plain connection, we're done now self._on_connect() - return - if self.incoming_stream_version() != '1.0': - # if stream version is less than 1.0, we can't do more - log.warn('While connecting with type = "tls": stream version is less than 1.0') - self._on_connect() - return - if not self.Dispatcher.Stream.features.getTag('starttls'): - # if server doesn't advertise TLS in init response, we can't do more - log.warn('While connecting with type = "tls": TLS unsupported by remote server') - self._on_connect() - return - # otherwise start TLS negotioation - self.stream_started = False - log.info("TLS supported by remote server. Requesting TLS start.") - self._tls_negotiation_handler() + else: + # try to negotiate TLS + if self.incoming_stream_version() != '1.0': + # if stream version is less than 1.0, we can't do more + log.warn('While connecting with type = "tls": stream version is less than 1.0') + self._on_connect() + return + if self.Dispatcher.Stream.features.getTag('starttls'): + # Server advertises TLS support, start negotiation + self.stream_started = False + log.info('TLS supported by remote server. Requesting TLS start.') + self._tls_negotiation_handler() + else: + log.warn('While connecting with type = "tls": TLS unsupported by remote server') + self._on_connect() + elif self.connected in ['ssl', 'tls']: self._on_connect() + assert False # should never be reached def _tls_negotiation_handler(self, con=None, tag=None): ''' takes care of TLS negotioation with <starttls> ''' @@ -374,7 +383,7 @@ return tagname = tag.getName() if tagname == 'failure': - self.disconnect('TLS <failure> received: %s' % tag) + self.disconnect('TLS <failure> received: %s' % tag) return log.info('Got starttls proceed response. Switching to TLS/SSL...') # following call wouldn't work for BOSH transport but it doesn't matter @@ -439,13 +448,13 @@ def _on_doc_attrs(self): ''' Plug authentication objects and start auth. ''' if self._sasl: - auth_nb.SASL(self._User, self._Password, + auth_nb.SASL.get_instance(self._User, self._Password, self._on_start_sasl).PlugIn(self) if not self._sasl or self.SASL.startsasl == 'not-supported': if not self._Resource: self._Resource = 'xmpppy' - auth_nb.NonBlockingNonSASL(self._User, self._Password, self._Resource, - self._on_old_auth).PlugIn(self) + auth_nb.NonBlockingNonSASL.get_instance(self._User, self._Password, + self._Resource, self._on_old_auth).PlugIn(self) return self.SASL.auth() return True @@ -464,10 +473,10 @@ # wrong user/pass, stop auth if 'SASL' in self.__dict__: self.SASL.PlugOut() - self.connected = None + self.connected = None # FIXME: is this intended? self._on_sasl_auth(None) elif self.SASL.startsasl == 'success': - auth_nb.NonBlockingBind().PlugIn(self) + auth_nb.NonBlockingBind.get_instance().PlugIn(self) self.onreceive(self._on_auth_bind) return True @@ -483,7 +492,7 @@ def initRoster(self): ''' Plug in the roster. ''' if not self.__dict__.has_key('NonBlockingRoster'): - roster_nb.NonBlockingRoster().PlugIn(self) + roster_nb.NonBlockingRoster.get_instance().PlugIn(self) def getRoster(self, on_ready=None): ''' Return the Roster instance, previously plugging it in and @@ -497,7 +506,7 @@ Can also request roster from server if according agrument is set.''' if requestRoster: # FIXME: used somewhere? - roster_nb.NonBlockingRoster().PlugIn(self) + roster_nb.NonBlockingRoster.get_instance().PlugIn(self) self.send(dispatcher_nb.Presence(to=jid, typ=typ)) ############################################################################### Modified: branches/osx_newbuildsys/src/common/xmpp/dispatcher_nb.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/dispatcher_nb.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/xmpp/dispatcher_nb.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -22,9 +22,9 @@ import simplexml, sys, locale from xml.parsers.expat import ExpatError -from client import PlugIn -from protocol import NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, \ - Message, Protocol, Node, Error, ERR_FEATURE_NOT_IMPLEMENTED, StreamError +from plugin import PlugIn +from protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, + Message, Protocol, Node, Error, ERR_FEATURE_NOT_IMPLEMENTED, StreamError) import logging log = logging.getLogger('gajim.c.x.dispatcher_nb') @@ -52,6 +52,16 @@ XMPPDispatcher().PlugIn(client_obj) elif client_obj.protocol_type == 'BOSH': BOSHDispatcher().PlugIn(client_obj, after_SASL, old_features) + + @classmethod + def get_instance(cls, *args, **kwargs): + ''' + Factory Method for object creation. + + Use this instead of directly initializing the class in order to make + unit testing much easier. + ''' + return cls(*args, **kwargs) class XMPPDispatcher(PlugIn): Copied: branches/osx_newbuildsys/src/common/xmpp/plugin.py (from rev 10945, trunk/src/common/xmpp/plugin.py) =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/plugin.py (rev 0) +++ branches/osx_newbuildsys/src/common/xmpp/plugin.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -0,0 +1,97 @@ +## plugin.py +## +## Copyright (C) 2003-2005 Alexey "Snake" Nezhdanov +## +## 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 +## the Free Software Foundation; either version 2, or (at your option) +## any later version. +## +## This program 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. + +# $Id: client.py,v 1.52 2006/01/02 19:40:55 normanr Exp $ + +''' +Provides PlugIn class functionality to develop extentions for xmpppy. +''' + +import logging +log = logging.getLogger('gajim.c.x.plugin') + +class PlugIn: + ''' + Abstract xmpppy plugin infrastructure code, providing plugging in/out and + debugging functionality. + + Inherit to develop pluggable objects. No code change on the owner class + required (the object where we plug into) + + For every instance of PlugIn class the 'owner' is the class in what the plug + was plugged. + ''' + def __init__(self): + self._exported_methods=[] + + def PlugIn(self, owner): + ''' + Attach to owner and register ourself and our _exported_methods in it. + If defined by a subclass, call self.plugin(owner) to execute hook + code after plugging. + ''' + self._owner=owner + log.info('Plugging %s __INTO__ %s' % (self, self._owner)) + if self.__class__.__name__ in owner.__dict__: + log.debug('Plugging ignored: another instance already plugged.') + return + self._old_owners_methods=[] + for method in self._exported_methods: + if method.__name__ in owner.__dict__: + self._old_owners_methods.append(owner.__dict__[method.__name__]) + owner.__dict__[method.__name__]=method + if self.__class__.__name__.endswith('Dispatcher'): + # FIXME: I need BOSHDispatcher or XMPPDispatcher on .Dispatcher + # there must be a better way.. + owner.__dict__['Dispatcher']=self + else: + owner.__dict__[self.__class__.__name__]=self + + # Execute hook + if hasattr(self,'plugin'): + return self.plugin(owner) + + def PlugOut(self): + ''' + Unregister our _exported_methods from owner and detach from it. + If defined by a subclass, call self.plugout() after unplugging to execute + hook code. + ''' + log.info('Plugging %s __OUT__ of %s.' % (self, self._owner)) + for method in self._exported_methods: + del self._owner.__dict__[method.__name__] + for method in self._old_owners_methods: + self._owner.__dict__[method.__name__]=method + # FIXME: Dispatcher workaround + if self.__class__.__name__.endswith('Dispatcher'): + del self._owner.__dict__['Dispatcher'] + else: + del self._owner.__dict__[self.__class__.__name__] + # Execute hook + if hasattr(self,'plugout'): + return self.plugout() + del self._owner + + @classmethod + def get_instance(cls, *args, **kwargs): + ''' + Factory Method for object creation. + + Use this instead of directly initializing the class in order to make + unit testing easier. For testing, this method can be patched to inject + mock objects. + ''' + return cls(*args, **kwargs) + +# vim: se ts=3: Modified: branches/osx_newbuildsys/src/common/xmpp/proxy_connectors.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/proxy_connectors.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/xmpp/proxy_connectors.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -55,6 +55,16 @@ self.old_on_receive = old_on_receive self.start_connecting() + + @classmethod + def get_instance(cls, *args, **kwargs): + ''' + Factory Method for object creation. + + Use this instead of directly initializing the class in order to make + unit testing much easier. + ''' + return cls(*args, **kwargs) def start_connecting(self): raise NotImplementedError Modified: branches/osx_newbuildsys/src/common/xmpp/roster_nb.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/roster_nb.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/xmpp/roster_nb.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -22,7 +22,7 @@ ''' from protocol import JID, Iq, Presence, Node, NodeProcessed, NS_ROSTER -from client import PlugIn +from plugin import PlugIn import logging log = logging.getLogger('gajim.c.x.roster_nb') Modified: branches/osx_newbuildsys/src/common/xmpp/tls_nb.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/tls_nb.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/xmpp/tls_nb.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -16,7 +16,7 @@ ## GNU General Public License for more details. import socket -from client import PlugIn +from plugin import PlugIn import sys import os @@ -249,13 +249,12 @@ "SSL_CB_ALERT": 0x4000, "SSL_CB_HANDSHAKE_START": 0x10, "SSL_CB_HANDSHAKE_DONE": 0x20} - def PlugIn(self, owner): + def plugin(self, owner): ''' Use to PlugIn TLS into transport and start establishing immediately Returns True if TLS/SSL was established correctly, otherwise False. ''' log.info('Starting TLS estabilishing') - PlugIn.PlugIn(self, owner) try: res = self._startSSL() except Exception, e: @@ -328,9 +327,8 @@ def _startSSL_pyOpenSSL(self): log.debug("_startSSL_pyOpenSSL called") tcpsock = self._owner - # FIXME: should method be configurable? - #tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.TLSv1_METHOD) - tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv23_METHOD) + # See http://docs.python.org/dev/library/ssl.html + tcpsock._sslContext = OpenSSL.SSL.Context(OpenSSL.SSL.SSLv3_METHOD) tcpsock.ssl_errnum = 0 tcpsock._sslContext.set_verify(OpenSSL.SSL.VERIFY_PEER, self._ssl_verify_callback) Modified: branches/osx_newbuildsys/src/common/xmpp/transports_nb.py =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/transports_nb.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/xmpp/transports_nb.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -25,7 +25,7 @@ ''' from simplexml import ustr -from client import PlugIn +from plugin import PlugIn from idlequeue import IdleObject import proxy_connectors import tls_nb @@ -74,22 +74,27 @@ #: size of the buffer which reads data from server # if lower, more stanzas will be fragmented and processed twice RECV_BUFSIZE = 32768 # 2x maximum size of ssl packet, should be plenty -#RECV_BUFSIZE = 16 # FIXME: (#2634) gajim breaks with this setting: it's inefficient but should work. +# FIXME: (#2634) gajim breaks with #RECV_BUFSIZE = 16 +# it's inefficient but should work. Problem is that connect machine makes wrong +# assumptions and that we only check for pending data in sockets but not in SSL +# buffer... -DATA_RECEIVED='DATA RECEIVED' -DATA_SENT='DATA SENT' +DATA_RECEIVED = 'DATA RECEIVED' +DATA_SENT = 'DATA SENT' DISCONNECTED = 'DISCONNECTED' DISCONNECTING = 'DISCONNECTING' CONNECTING = 'CONNECTING' PROXY_CONNECTING = 'PROXY_CONNECTING' CONNECTED = 'CONNECTED' -STATES = [DISCONNECTED, CONNECTING, PROXY_CONNECTING, CONNECTED, DISCONNECTING] -# Transports have different arguments in constructor and same connect() method. +STATES = (DISCONNECTED, CONNECTING, PROXY_CONNECTING, CONNECTED, DISCONNECTING) class NonBlockingTransport(PlugIn): ''' Abstract class representing a transport. + + Subclasses CAN have different constructor signature but connect method SHOULD + be the same. ''' def __init__(self, raise_event, on_disconnect, idlequeue, estabilish_tls, certs): @@ -198,6 +203,7 @@ if hasattr(self._owner, 'Dispatcher'): self.on_receive = self._owner.Dispatcher.ProcessNonBlocking else: + log.warning('No Dispatcher plugged. Received data will not be processed') self.on_receive = None return self.on_receive = recv_handler @@ -321,15 +327,14 @@ proxyclass = proxy_connectors.SOCKS5Connector elif self.proxy_dict['type'] == 'http' : proxyclass = proxy_connectors.HTTPCONNECTConnector - proxyclass( - send_method = self.send, - onreceive = self.onreceive, - old_on_receive = self.on_receive, - on_success = self._on_connect, - on_failure = self._on_connect_failure, - xmpp_server = self.proxy_dict['xmpp_server'], - proxy_creds = self.proxy_dict['credentials'] - ) + proxyclass.get_instance( + send_method=self.send, + onreceive=self.onreceive, + old_on_receive=self.on_receive, + on_success=self._on_connect, + on_failure=self._on_connect_failure, + xmpp_server=self.proxy_dict['xmpp_server'], + proxy_creds=self.proxy_dict['credentials']) def _on_connect(self): ''' @@ -344,14 +349,13 @@ else: NonBlockingTransport._on_connect(self) - def tls_init(self, on_succ, on_fail): ''' Estabilishes TLS/SSL using this TCP connection by plugging a NonBlockingTLS module ''' cacerts, mycerts = self.certs - result = tls_nb.NonBlockingTLS(cacerts, mycerts).PlugIn(self) + result = tls_nb.NonBlockingTLS.get_instance(cacerts, mycerts).PlugIn(self) if result: on_succ() else: Modified: branches/osx_newbuildsys/src/common/zeroconf/client_zeroconf.py =================================================================== --- branches/osx_newbuildsys/src/common/zeroconf/client_zeroconf.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/common/zeroconf/client_zeroconf.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -21,7 +21,7 @@ import common.xmpp from common.xmpp.idlequeue import IdleObject from common.xmpp import dispatcher_nb, simplexml -from common.xmpp.client import * +from common.xmpp.plugin import * from common.xmpp.simplexml import ustr from common.xmpp.transports_nb import DATA_RECEIVED, DATA_SENT from common.zeroconf import zeroconf Modified: branches/osx_newbuildsys/src/conversation_textview.py =================================================================== --- branches/osx_newbuildsys/src/conversation_textview.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/conversation_textview.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -1150,8 +1150,8 @@ '', None) imagepath = None end_iter = buffer_.get_end_iter() - anchor = buffer_.create_child_anchor(end_iter) if imagepath is not None: + anchor = buffer_.create_child_anchor(end_iter) img = gtk.Image() img.set_from_file(imagepath) img.show() Modified: branches/osx_newbuildsys/src/roster_window.py =================================================================== --- branches/osx_newbuildsys/src/roster_window.py 2009-01-10 21:54:30 UTC (rev 10959) +++ branches/osx_newbuildsys/src/roster_window.py 2009-01-10 21:56:21 UTC (rev 10960) @@ -3519,7 +3519,6 @@ self.collapsed_rows.remove(account + group) for contact in gajim.contacts.iter_contacts(account): jid = contact.jid - print contact.jid, group, gajim.contacts.is_big_brother(account, contact.jid, accounts), self.collapsed_rows if group in contact.groups and gajim.contacts.is_big_brother( account, jid, accounts) and account + group + jid \ not in self.collapsed_rows:

1 0

[commit-gajim] r10959 - in branches/osx_newbuildsys: . data/glade scripts src
by js＠gajim.org 10 Jan '09

10 Jan '09

Author: js Date: 2009-01-10 22:54:30 +0100 (Sat, 10 Jan 2009) New Revision: 10959 Added: branches/osx_newbuildsys/scripts/gajim-history-manager.in Modified: branches/osx_newbuildsys/configure.ac branches/osx_newbuildsys/data/glade/preferences_window.glade branches/osx_newbuildsys/scripts/Makefile branches/osx_newbuildsys/src/gajim-remote.py branches/osx_newbuildsys/src/gajim.py branches/osx_newbuildsys/src/history_manager.py branches/osx_newbuildsys/src/roster_window.py Log: Merge trunk r10939. Rest will follow later. I *HATE* having to merge manually due to conflicts! Modified: branches/osx_newbuildsys/configure.ac =================================================================== --- branches/osx_newbuildsys/configure.ac 2009-01-10 21:44:38 UTC (rev 10958) +++ branches/osx_newbuildsys/configure.ac 2009-01-10 21:54:30 UTC (rev 10959) @@ -181,6 +181,7 @@ data/defs.py scripts/gajim scripts/gajim-remote + scripts/gajim-history-manager po/Makefile.in ]) BUILDSYS_TOUCH_DEPS Modified: branches/osx_newbuildsys/data/glade/preferences_window.glade =================================================================== --- branches/osx_newbuildsys/data/glade/preferences_window.glade 2009-01-10 21:44:38 UTC (rev 10958) +++ branches/osx_newbuildsys/data/glade/preferences_window.glade 2009-01-10 21:54:30 UTC (rev 10959) @@ -859,7 +859,9 @@ <widget class="GtkEntry" id="auto_xa_message_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message</property> + <property name="tooltip" translatable="yes">The auto not available status message. If empty, Gajim will not change the current status message +$S will be replaced by previous status message +$T will be replaced by auto-not-available timeout</property> <signal name="changed" handler="on_auto_xa_message_entry_changed"/> </widget> <packing> @@ -874,7 +876,9 @@ <widget class="GtkEntry" id="auto_away_message_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message</property> + <property name="tooltip" translatable="yes">The auto away status message. If empty, Gajim will not change the current status message +$S will be replaced by previous status message +$T will be replaced by auto-away timeout</property> <signal name="changed" handler="on_auto_away_message_entry_changed"/> </widget> <packing> Modified: branches/osx_newbuildsys/scripts/Makefile =================================================================== --- branches/osx_newbuildsys/scripts/Makefile 2009-01-10 21:44:38 UTC (rev 10958) +++ branches/osx_newbuildsys/scripts/Makefile 2009-01-10 21:54:30 UTC (rev 10959) @@ -1,7 +1,7 @@ include ../buildsys.mk install-extra: - for i in gajim gajim-remote; do \ + for i in gajim gajim-remote gajim-history-manager; do \ ${INSTALL_STATUS}; \ if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \ ${INSTALL_OK}; \ Copied: branches/osx_newbuildsys/scripts/gajim-history-manager.in (from rev 10939, trunk/scripts/gajim-history-manager.in) =================================================================== --- branches/osx_newbuildsys/scripts/gajim-history-manager.in (rev 0) +++ branches/osx_newbuildsys/scripts/gajim-history-manager.in 2009-01-10 21:54:30 UTC (rev 10959) @@ -0,0 +1,31 @@ +#!/bin/sh +## scripts/gajim-history-manager.in +## +## Copyright (C) 2009 Yann Le Boulanger <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/>. +## + +if test $(id -u) -eq 0; then + echo "You must not launch Gajim as root, it is INSECURE" + exit 1 +fi + +export datadir=@DATADIR@/gajim +PYTHON_EXEC=@PYTHON@ + +cd ${datadir}/src +export PYTHONPATH="$PYTHONPATH:@LIBDIR@/gajim" +exec ${PYTHON_EXEC} -OO history_manager.py $@ Modified: branches/osx_newbuildsys/src/gajim-remote.py =================================================================== --- branches/osx_newbuildsys/src/gajim-remote.py 2009-01-10 21:44:38 UTC (rev 10958) +++ branches/osx_newbuildsys/src/gajim-remote.py 2009-01-10 21:54:30 UTC (rev 10959) @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding:utf-8 -*- ## src/gajim-remote.py ## Modified: branches/osx_newbuildsys/src/gajim.py =================================================================== --- branches/osx_newbuildsys/src/gajim.py 2009-01-10 21:44:38 UTC (rev 10958) +++ branches/osx_newbuildsys/src/gajim.py 2009-01-10 21:54:30 UTC (rev 10959) @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding:utf-8 -*- ## src/gajim.py ## Modified: branches/osx_newbuildsys/src/history_manager.py =================================================================== --- branches/osx_newbuildsys/src/history_manager.py 2009-01-10 21:44:38 UTC (rev 10958) +++ branches/osx_newbuildsys/src/history_manager.py 2009-01-10 21:54:30 UTC (rev 10959) @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding:utf-8 -*- ## src/history_manager.py ## Modified: branches/osx_newbuildsys/src/roster_window.py =================================================================== --- branches/osx_newbuildsys/src/roster_window.py 2009-01-10 21:44:38 UTC (rev 10958) +++ branches/osx_newbuildsys/src/roster_window.py 2009-01-10 21:54:30 UTC (rev 10959) @@ -1407,6 +1407,19 @@ self.tree.expand_row(path, False) return False + def _adjust_contact_expand_collapse_state(self, jid, account): + '''Expand/collapse group row based on self.collapsed_rows''' + iterC = self._get_contact_iter(jid, account) + if not iterC: + # Contact not visible + return + path = self.modelfilter.get_path(iterC) + if account + group in self.collapsed_rows: + self.tree.collapse_row(path) + else: + self.tree.expand_row(path, False) + return False + ############################################################################## ### Roster and Modelfilter handling ############################################################################## @@ -3504,6 +3517,16 @@ gajim.groups[account][group]['expand'] = True if account + group in self.collapsed_rows: self.collapsed_rows.remove(account + group) + for contact in gajim.contacts.iter_contacts(account): + jid = contact.jid + print contact.jid, group, gajim.contacts.is_big_brother(account, contact.jid, accounts), self.collapsed_rows + if group in contact.groups and gajim.contacts.is_big_brother( + account, jid, accounts) and account + group + jid \ + not in self.collapsed_rows: + titers = self._get_contact_iter(jid, account) + for titer in titers: + path = model.get_path(titer) + self.tree.expand_row(path, False) elif type_ == 'account': account = accounts[0] # There is only one cause we don't use merge if account in self.collapsed_rows: @@ -3520,6 +3543,10 @@ # Metacontact got toggled, update icon jid = model[titer][C_JID].decode('utf-8') account = model[titer][C_ACCOUNT].decode('utf-8') + contact = gajim.contacts.get_contact(account, jid) + for group in contact.groups: + if account + group + jid in self.collapsed_rows: + self.collapsed_rows.append(account + group + jid) family = gajim.contacts.get_metacontacts_family(account, jid) nearby_family = \ self._get_nearby_family_and_big_brother(family, account)[0] @@ -3549,17 +3576,21 @@ for account in accounts: if group in gajim.groups[account]: # This account has this group gajim.groups[account][group]['expand'] = False - if not account + group in self.collapsed_rows: + if account + group not in self.collapsed_rows: self.collapsed_rows.append(account + group) elif type_ == 'account': account = accounts[0] # There is only one cause we don't use merge - if not account in self.collapsed_rows: + if account not in self.collapsed_rows: self.collapsed_rows.append(account) self.draw_account(account) elif type_ == 'contact': # Metacontact got toggled, update icon jid = model[titer][C_JID].decode('utf-8') account = model[titer][C_ACCOUNT].decode('utf-8') + contact = gajim.contacts.get_contact(account, jid) + for group in contact.groups: + if account + group + jid not in self.collapsed_rows: + self.collapsed_rows.append(account + group + jid) family = gajim.contacts.get_metacontacts_family(account, jid) nearby_family = \ self._get_nearby_family_and_big_brother(family, account)[0]

1 0

[commit-gajim] r10958 - branches/osx_newbuildsys/src/common/xmpp
by js＠gajim.org 10 Jan '09

10 Jan '09

Author: js Date: 2009-01-10 22:44:38 +0100 (Sat, 10 Jan 2009) New Revision: 10958 Modified: branches/osx_newbuildsys/src/common/xmpp/Makefile Log: Remove debug.py. Modified: branches/osx_newbuildsys/src/common/xmpp/Makefile =================================================================== --- branches/osx_newbuildsys/src/common/xmpp/Makefile 2009-01-10 21:42:02 UTC (rev 10957) +++ branches/osx_newbuildsys/src/common/xmpp/Makefile 2009-01-10 21:44:38 UTC (rev 10958) @@ -4,7 +4,6 @@ c14n.py \ client.py \ client_nb.py \ - debug.py \ dispatcher_nb.py \ features_nb.py \ idlequeue.py \

1 0

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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2009