Commits

commits@gajim.org

17632 discussions

gajim: add missing icon
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset 8c5d6c908de8 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=8c5d6c908de8 description: add missing icon diffstat: icons/hicolor/16x16/actions/gajim-message_corrected.png | Bin 1 files changed, 0 insertions(+), 0 deletions(-) diffs (2 lines): diff -r 6809fc371f77 -r 8c5d6c908de8 icons/hicolor/16x16/actions/gajim-message_corrected.png Binary file icons/hicolor/16x16/actions/gajim-message_corrected.png has changed

1 0

gajim: update Changelog
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset f42100bef7cd in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=f42100bef7cd description: update Changelog diffstat: ChangeLog | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (15 lines): diff -r db66cbf9fa32 -r f42100bef7cd ChangeLog --- a/ChangeLog Thu Apr 25 20:38:18 2013 +0200 +++ b/ChangeLog Thu Apr 25 21:36:28 2013 +0200 @@ -4,8 +4,9 @@ * use external python-nbxmpp library * Improve audio / Video calls and add screensharing feature * Support systemd-logind - * Support XEP-0224 (Attention) - * Support XEP-0191 blocking command + * Support XEP-0308 Last message correction + * Support XEP-0224 Attention + * Support XEP-0191 Blocking command Gajim 0.15.3 (17 March 2013)

1 0

gajim: translate also files in src/command_system/*.py. Fixes #7324
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset e906072460b3 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e906072460b3 description: translate also files in src/command_system/*.py. Fixes #7324 diffstat: autogen.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r cf0225859b9a -r e906072460b3 autogen.sh --- a/autogen.sh Sun Apr 14 08:49:10 2013 +0200 +++ b/autogen.sh Sun Apr 21 10:13:47 2013 +0200 @@ -15,7 +15,7 @@ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ po/POTFILES.in; done \ && ls -1 data/gajim.desktop.in.in \ - src/*.py src/common/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ + src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ po/POTFILES.in \ && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 if [ $(find plugins/ -name '*.py' | wc -l) -gt 0 ];then

1 0

gajim: XEP-0308 Last Message Correction support.
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset db66cbf9fa32 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=db66cbf9fa32 description: XEP-0308 Last Message Correction support. diffstat: src/chat_control.py | 110 ++++++++++++++++++++------ src/common/connection.py | 79 ++++++++++++++++--- src/common/connection_handlers_events.py | 11 ++ src/common/gajim.py | 2 +- src/conversation_textview.py | 124 ++++++++++++++++++++++++------ src/groupchat_control.py | 52 ++++++++++++- src/roster_window.py | 2 +- src/session.py | 2 +- 8 files changed, 307 insertions(+), 75 deletions(-) diffs (truncated from 884 to 300 lines): diff -r e906072460b3 -r db66cbf9fa32 src/chat_control.py --- a/src/chat_control.py Sun Apr 21 10:13:47 2013 +0200 +++ b/src/chat_control.py Thu Apr 25 20:38:18 2013 +0200 @@ -344,13 +344,13 @@ if resource is None: # We very likely got a contact with a random resource. # This is bad, we need the highest for caps etc. - c = gajim.contacts.get_contact_with_highest_priority( - acct, contact.jid) + c = gajim.contacts.get_contact_with_highest_priority(acct, + contact.jid) if c and not isinstance(c, GC_Contact): contact = c MessageControl.__init__(self, type_id, parent_win, widget_name, - contact, acct, resource=resource) + contact, acct, resource=resource) widget = self.xml.get_object('history_button') # set document-open-recent icon for history button @@ -369,15 +369,15 @@ # Create banner and connect signals widget = self.xml.get_object('banner_eventbox') id_ = widget.connect('button-press-event', - self._on_banner_eventbox_button_press_event) + self._on_banner_eventbox_button_press_event) self.handlers[id_] = widget self.urlfinder = re.compile( - r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]") + r"(www\.(?!\.)|[a-z][a-z0-9+.-]*://)[^\s<>'\"]+[^!,\.\s<>\)'\"\]]") self.banner_status_label = self.xml.get_object('banner_label') id_ = self.banner_status_label.connect('populate_popup', - self.on_banner_label_populate_popup) + self.on_banner_label_populate_popup) self.handlers[id_] = self.banner_status_label # Init DND @@ -397,34 +397,38 @@ id_ = self.conv_textview.connect('quote', self.on_quote) self.handlers[id_] = self.conv_textview.tv id_ = self.conv_textview.tv.connect('key_press_event', - self._conv_textview_key_press_event) + self._conv_textview_key_press_event) self.handlers[id_] = self.conv_textview.tv # FIXME: DND on non editable TextView, find a better way self.drag_entered = False id_ = self.conv_textview.tv.connect('drag_data_received', - self._on_drag_data_received) + self._on_drag_data_received) self.handlers[id_] = self.conv_textview.tv id_ = self.conv_textview.tv.connect('drag_motion', self._on_drag_motion) self.handlers[id_] = self.conv_textview.tv id_ = self.conv_textview.tv.connect('drag_leave', self._on_drag_leave) self.handlers[id_] = self.conv_textview.tv self.conv_textview.tv.drag_dest_set(Gtk.DestDefaults.MOTION | - Gtk.DestDefaults.HIGHLIGHT | - Gtk.DestDefaults.DROP, - self.dnd_list, Gdk.DragAction.COPY) + Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, + self.dnd_list, Gdk.DragAction.COPY) self.conv_scrolledwindow = self.xml.get_object( - 'conversation_scrolledwindow') + 'conversation_scrolledwindow') self.conv_scrolledwindow.add(self.conv_textview.tv) widget = self.conv_scrolledwindow.get_vadjustment() id_ = widget.connect('value-changed', - self.on_conversation_vadjustment_value_changed) + self.on_conversation_vadjustment_value_changed) self.handlers[id_] = widget id_ = widget.connect('changed', - self.on_conversation_vadjustment_changed) + self.on_conversation_vadjustment_changed) self.handlers[id_] = widget self.scroll_to_end_id = None self.was_at_the_end = True + self.correcting = False + self.last_sent_msg = None + self.last_sent_txt = None + self.last_received_txt = {} # one per name + self.last_received_id = {} # one per name # add MessageTextView to UI and connect signals self.msg_scrolledwindow = self.xml.get_object('message_scrolledwindow') @@ -928,12 +932,23 @@ label = self.get_seclabel() + def _cb(msg, cb, *cb_args): + self.last_sent_msg = msg + self.last_sent_txt = cb_args[1] + if cb: + cb(msg, *cb_args) + + if self.correcting and self.last_sent_msg: + correction_msg = self.last_sent_msg + else: + correction_msg = None + gajim.nec.push_outgoing_event(MessageOutgoingEvent(None, account=self.account, jid=self.contact.jid, message=message, keyID=keyID, type_=type_, chatstate=chatstate, msg_id=msg_id, resource=resource, user_nick=self.user_nick, xhtml=xhtml, - label=label, callback=callback, callback_args=callback_args, - control=self, attention=attention)) + label=label, callback=_cb, callback_args=[callback] + callback_args, + control=self, attention=attention, correction_msg=correction_msg)) # Record the history of sent messages self.save_message(message, 'sent') @@ -974,9 +989,11 @@ def print_conversation_line(self, text, kind, name, tim, other_tags_for_name=[], other_tags_for_time=[], other_tags_for_text=[], count_as_new=True, subject=None, old_kind=None, xhtml=None, simple=False, - xep0184_id=None, graphics=True, displaymarking=None, msg_id=None): + xep0184_id=None, graphics=True, displaymarking=None, msg_id=None, + correct_id=None): """ Print 'chat' type messages + correct_id = (message_id, correct_id) """ jid = self.contact.jid full_jid = self.get_full_jid() @@ -984,16 +1001,28 @@ end = False if self.was_at_the_end or kind == 'outgoing': end = True - textview.print_conversation_line(text, jid, kind, name, tim, - other_tags_for_name, other_tags_for_time, other_tags_for_text, - subject, old_kind, xhtml, simple=simple, graphics=graphics, - displaymarking=displaymarking) + old_txt = '' + if name in self.last_received_txt: + old_txt = self.last_received_txt[name] + if correct_id and correct_id[1] and \ + name in self.conv_textview.last_received_message_marks and \ + correct_id[1] == self.last_received_id[name]: + self.conv_textview.correct_last_received_message(text, xhtml, + name, old_txt) + else: + textview.print_conversation_line(text, jid, kind, name, tim, + other_tags_for_name, other_tags_for_time, other_tags_for_text, + subject, old_kind, xhtml, simple=simple, graphics=graphics, + displaymarking=displaymarking) if xep0184_id is not None: textview.show_xep0184_warning(xep0184_id) if not count_as_new: return + if kind in ('incoming', 'outgoing'): + self.last_received_txt[name] = text + self.last_received_id[name] = correct_id[0] if kind == 'incoming': if not self.type_id == message_control.TYPE_GC or \ gajim.config.get('notify_on_all_muc_messages') or \ @@ -1407,6 +1436,21 @@ start_iter = msg_buf.get_start_iter() end_iter = msg_buf.get_end_iter() self.orig_msg = msg_buf.get_text(start_iter, end_iter, False) + if pos == size and size > 0 and direction == 'up' and \ + msg_type == 'sent' and not self.correcting: + self.correcting = True + self.old_message_tv_color = self.msg_textview.get_style().base[ + Gtk.StateType.NORMAL] + self.msg_textview.modify_base(Gtk.StateType.NORMAL, Gdk.color_parse( + 'PaleGoldenrod')) + message = history[pos - 1] + msg_buf.set_text(message) + return + if self.correcting: + # We were previously correcting + self.msg_textview.modify_base(Gtk.StateType.NORMAL, + self.old_message_tv_color) + self.correcting = False pos += -1 if direction == 'up' else +1 if pos == -1: return @@ -1492,6 +1536,8 @@ 'chat_control', contact, acct, resource) self.gpg_is_active = False + self.last_recv_message_id = None + self.last_recv_message_marks = None # for muc use: # widget = self.xml.get_object('muc_window_actions_button') self.actions_button = self.xml.get_object('message_window_actions_button') @@ -2355,7 +2401,8 @@ GObject.source_remove(self.possible_inactive_timeout_id) self._schedule_activity_timers() - def _on_sent(id_, contact, message, encrypted, xhtml, label): + def _on_sent(msg, contact, message, encrypted, xhtml, label, old_txt): + id_ = msg.getID() if contact.supports(NS_RECEIPTS) and gajim.config.get_per('accounts', self.account, 'request_receipt'): xep0184_id = id_ @@ -2365,13 +2412,22 @@ displaymarking = label.getTag('displaymarking') else: displaymarking = None - self.print_conversation(message, self.contact.jid, encrypted=encrypted, - xep0184_id=xep0184_id, xhtml=xhtml, displaymarking=displaymarking) + if self.correcting and \ + self.conv_textview.last_sent_message_marks[0]: + self.conv_textview.correct_last_sent_message(message, xhtml, + self.get_our_nick(), old_txt) + self.correcting = False + self.msg_textview.modify_base(Gtk.StateType.NORMAL, + self.old_message_tv_color) + return + self.print_conversation(message, self.contact.jid, + encrypted=encrypted, xep0184_id=xep0184_id, xhtml=xhtml, + displaymarking=displaymarking) ChatControlBase.send_message(self, message, keyID, type_='chat', chatstate=chatstate_to_send, xhtml=xhtml, callback=_on_sent, callback_args=[contact, message, encrypted, xhtml, - self.get_seclabel()], process_commands=process_commands, + self.get_seclabel(), self.last_sent_txt], process_commands=process_commands, attention=attention) def check_for_possible_paused_chatstate(self, arg): @@ -2483,7 +2539,7 @@ def print_conversation(self, text, frm='', tim=None, encrypted=False, subject=None, xhtml=None, simple=False, xep0184_id=None, - displaymarking=None, msg_id=None): + displaymarking=None, msg_id=None, correct_id=None): """ Print a line in the conversation @@ -2548,7 +2604,7 @@ ChatControlBase.print_conversation_line(self, text, kind, name, tim, subject=subject, old_kind=self.old_msg_kind, xhtml=xhtml, simple=simple, xep0184_id=xep0184_id, displaymarking=displaymarking, - msg_id=msg_id) + msg_id=msg_id, correct_id=correct_id) if text.startswith('/me ') or text.startswith('/me\n'): self.old_msg_kind = None else: diff -r e906072460b3 -r db66cbf9fa32 src/common/connection.py --- a/src/common/connection.py Sun Apr 21 10:13:47 2013 +0200 +++ b/src/common/connection.py Thu Apr 25 20:38:18 2013 +0200 @@ -254,9 +254,11 @@ def _prepare_message(self, jid, msg, keyID, type_='chat', subject='', chatstate=None, msg_id=None, resource=None, user_nick=None, xhtml=None, session=None, forward_from=None, form_node=None, label=None, - original_message=None, delayed=None, attention=False, callback=None): + original_message=None, delayed=None, attention=False, correction_msg=None, + callback=None): if not self.connection or self.connected < 2: return 1 + try: jid = self.check_jid(jid) except helpers.InvalidFormat: @@ -306,7 +308,7 @@ jid, xhtml, subject, chatstate, msg_id, label, forward_from, delayed, session, form_node, user_nick, keyID, attention, - callback) + correction_msg, callback) gajim.nec.push_incoming_event(GPGTrustKeyEvent(None, conn=self, callback=_on_always_trust)) else: @@ -314,7 +316,7 @@ original_message, fjid, resource, jid, xhtml, subject, chatstate, msg_id, label, forward_from, delayed, session, form_node, user_nick, keyID, - attention, callback) + attention, correction_msg, callback) gajim.thread_interface(encrypt_thread, [msg, keyID, False], _on_encrypted, []) return @@ -322,18 +324,19 @@ self._message_encrypted_cb(('', error), type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, chatstate, msg_id, label, forward_from, delayed, session, - form_node, user_nick, keyID, attention, callback) + form_node, user_nick, keyID, attention, correction_msg, + callback) return self._on_continue_message(type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, msgenc, keyID, chatstate, msg_id, label, forward_from, delayed, session, form_node, user_nick, - attention, callback) + attention, correction_msg, callback) def _message_encrypted_cb(self, output, type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, subject, chatstate, msg_id, label, forward_from, delayed, session, form_node, user_nick, keyID, - attention, callback): + attention, correction_msg, callback): msgenc, error = output if msgenc and not error:

1 0

gajim: re-enable test suite
by Yann Leboulanger 28 Jul '13

28 Jul '13

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

1 0

gajim: start fixing last test. still a problem with sessions
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset e1721cdeb5c3 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=e1721cdeb5c3 description: start fixing last test. still a problem with sessions diffstat: test/integration/test_gui_event_integration.py | 50 ++++++++++++++++++------- test/lib/gajim_mocks.py | 8 +++- 2 files changed, 42 insertions(+), 16 deletions(-) diffs (168 lines): diff -r 17de941d0c68 -r e1721cdeb5c3 test/integration/test_gui_event_integration.py --- a/test/integration/test_gui_event_integration.py Sun Apr 07 23:41:15 2013 +0200 +++ b/test/integration/test_gui_event_integration.py Mon Apr 08 18:57:39 2013 +0200 @@ -10,6 +10,7 @@ from common import gajim from common import contacts as contacts_module +from common import caps_cache from gajim import Interface from gajim_mocks import * @@ -21,17 +22,20 @@ from data import * import roster_window - +import plugins import notify class TestStatusChange(unittest.TestCase): - '''tests gajim.py's incredibly complex handle_event_notify''' + '''tests gajim.py's incredibly complex presence handling''' def setUp(self): gajim.connections = {} gajim.contacts = contacts_module.LegacyContactsAPI() gajim.interface.roster = roster_window.RosterWindow() + gajim.plugin_manager = plugins.PluginManager() + gajim.logger = MockLogger() + caps_cache.initialize(gajim.logger) for acc in contacts: gajim.connections[acc] = MockConnection(acc) @@ -45,19 +49,20 @@ def tearDown(self): notify.notifications = [] + for acc in contacts: + gajim.connections[acc].cleanup() - def contact_comes_online(self, account, jid, resource, prio): + def contact_comes_online(self, account, jid, resource, prio, + should_popup=True): '''a remote contact comes online''' - xml = """<presence from='%s/%s' id='123'> + xml = """<presence from='%s/%s' id='123'><priority>%s</priority> <c node='http://gajim.org' ver='pRCD6cgQ4SDqNMCjdhRV6TECx5o=' hash='sha-1' xmlns='http://jabber.org/protocol/caps'/> <status>I'm back!</status> </presence> - """ % (jid, resource) + """ % (jid, resource, prio) msg = nbxmpp.protocol.Presence(node=nbxmpp.simplexml.XML2Node(xml)) gajim.connections[account]._presenceCB(None, msg) -# gajim.interface.handle_event_notify(account, (jid, 'online', "I'm back!", -# resource, prio, None, time.time(), None)) contact = None for c in gajim.contacts.get_contacts(account, jid): @@ -70,13 +75,24 @@ self.assertEqual(prio, contact.priority) # the most recent notification is that the contact connected - self.assertEqual('contact_connected', notify.notifications[-1][0]) + if should_popup: + self.assertEqual('Contact Signed In', + notify.notifications[-1].popup_event_type) + else: + self.assertEqual('', notify.notifications[-1].popup_event_type) def contact_goes_offline(self, account, jid, resource, prio, still_exists = True): '''a remote contact goes offline.''' - gajim.interface.handle_event_notify(account, (jid, 'offline', 'Goodbye!', - resource, prio, None, time.time(), None)) + xml = """<presence type='unavailable' from='%s/%s' id='123'> + <priority>%s</priority> + <c node='http://gajim.org' ver='pRCD6cgQ4SDqNMCjdhRV6TECx5o=' + hash='sha-1' xmlns='http://jabber.org/protocol/caps'/> + <status>Goodbye!</status> + </presence> + """ % (jid, resource, prio) + msg = nbxmpp.protocol.Presence(node=nbxmpp.simplexml.XML2Node(xml)) + gajim.connections[account]._presenceCB(None, msg) contact = None for c in gajim.contacts.get_contacts(account, jid): @@ -92,7 +108,8 @@ self.assertEqual('Goodbye!', contact.status) self.assertEqual(prio, contact.priority) - self.assertEqual('contact_disconnected', notify.notifications[-1][0]) + self.assertEqual('Contact Signed Out', + notify.notifications[-1].popup_event_type) def user_starts_chatting(self, jid, account, resource=None): '''the user opens a chat window and starts talking''' @@ -150,7 +167,8 @@ ctrl = self.user_starts_chatting(jid, account1) - self.contact_comes_online(account1, jid, 'highprio', 50) + self.contact_comes_online(account1, jid, 'highprio', 50, + should_popup=False) # old session was dropped self.assertEqual(None, ctrl.session) @@ -159,12 +177,13 @@ jid = 'default1(a)gajim.org' self.contact_comes_online(account1, jid, 'lowprio', 1) - self.contact_comes_online(account1, jid, 'highprio', 50) + self.contact_comes_online(account1, jid, 'highprio', 50, + should_popup=False) ctrl = self.user_starts_chatting(jid, account1) self.contact_goes_offline(account1, jid, 'highprio', 50, - still_exists=False) + still_exists=False) # old session was dropped self.assertEqual(None, ctrl.session) @@ -176,7 +195,8 @@ ctrl = self.user_starts_esession(jid, 'lowprio', account1) - self.contact_comes_online(account1, jid, 'highprio', 50) + self.contact_comes_online(account1, jid, 'highprio', 50, + should_popup=False) # session was associated with the low priority full jid, so it should # have been removed from the control diff -r 17de941d0c68 -r e1721cdeb5c3 test/lib/gajim_mocks.py --- a/test/lib/gajim_mocks.py Sun Apr 07 23:41:15 2013 +0200 +++ b/test/lib/gajim_mocks.py Mon Apr 08 18:57:39 2013 +0200 @@ -11,9 +11,13 @@ class MockConnection(Mock, ConnectionHandlers): def __init__(self, account, *args): Mock.__init__(self, *args) + + self.connection = Mock() + + self.name = account + ConnectionHandlers.__init__(self) - self.name = account self.connected = 2 self.pep = {} self.blocked_contacts = {} @@ -122,6 +126,7 @@ class MockLogger(Mock): def __init__(self): Mock.__init__(self, {'write': None, 'get_transports_type': {}}) + self.cur = Mock() class MockContact(Mock): @@ -139,6 +144,7 @@ self.jid = jid self.type_ = type_ self.thread_id = thread_id + self.resource = '' if not self.thread_id: self.thread_id = '%0x' % random.randint(0, 10000)

1 0

gajim: make FakeDataform instructino label selectable. Fixes #7331
by Yann Leboulanger 28 Jul '13

28 Jul '13

changeset cf0225859b9a in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=cf0225859b9a description: make FakeDataform instructino label selectable. Fixes #7331 diffstat: src/config.py | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diffs (39 lines): diff -r e1721cdeb5c3 -r cf0225859b9a src/config.py --- a/src/config.py Mon Apr 08 18:57:39 2013 +0200 +++ b/src/config.py Sun Apr 14 08:49:10 2013 +0200 @@ -2698,9 +2698,10 @@ table {entry1: value1} """ - def __init__(self, infos): + def __init__(self, infos, selectable=False): GObject.GObject.__init__(self) self.infos = infos + self.selectable = selectable self.entries = {} self._draw_table() @@ -2713,6 +2714,8 @@ nbrow = 1 self.resize(rows = nbrow, columns = 2) label = Gtk.Label(label=self.infos['instructions']) + if self.selectable: + label.set_selectable(True) self.attach(label, 0, 2, 0, 1, 0, 0, 0, 0) for name in self.infos.keys(): if name in ('key', 'instructions', 'x', 'registered'): @@ -3794,10 +3797,12 @@ empty_config = True if obj.is_form: dataform = dataforms.ExtendForm(node=obj.config) - self.data_form_widget = dataforms_widget.DataFormWidget(dataform) + self.data_form_widget = dataforms_widget.DataFormWidget() + self.data_form_widget.selectable = True + self.data_form_widget.set_data_form(dataform) empty_config = False else: - self.data_form_widget = FakeDataForm(obj.config) + self.data_form_widget = FakeDataForm(obj.config, selectable=True) for field in obj.config: if field in ('key', 'instructions', 'x', 'registered'): continue

1 0

gajim: move ConnectionPEP class to connection_handlers to preven...
by Yann Leboulanger 28 Jul '13

28 Jul '13

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

1 0

gajim: remove unused class parameter
by Yann Leboulanger 28 Jul '13

28 Jul '13

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

1 0

gajim: update my copyright
by Yann Leboulanger 28 Jul '13

28 Jul '13

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

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits