Commits

commits@gajim.org

17632 discussions

gajim: update Changelog
by Yann Leboulanger 25 Apr '13

25 Apr '13

changeset 6eab1b6a3441 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6eab1b6a3441 description: update Changelog diffstat: ChangeLog | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 3107b848a275 -r 6eab1b6a3441 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: XEP-0308 Last Message Correction support.
by Yann Leboulanger 25 Apr '13

25 Apr '13

changeset 3107b848a275 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3107b848a275 description: XEP-0308 Last Message Correction support. diffstat: src/chat_control.py | 136 +++++++++++++++++++++--------- src/common/connection.py | 79 ++++++++++++++--- src/common/connection_handlers_events.py | 11 ++ src/common/gajim.py | 2 +- src/conversation_textview.py | 121 +++++++++++++++++++++----- src/groupchat_control.py | 52 ++++++++++- src/roster_window.py | 2 +- src/session.py | 2 +- 8 files changed, 318 insertions(+), 87 deletions(-) diffs (truncated from 937 to 300 lines): diff -r 105ef8b98877 -r 3107b848a275 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 @@ -343,13 +343,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 @@ -371,85 +371,90 @@ # 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 self.TARGET_TYPE_URI_LIST = 80 self.dnd_list = [('text/uri-list', 0, self.TARGET_TYPE_URI_LIST), - ('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_APP, 0)] + ('MY_TREE_MODEL_ROW', gtk.TARGET_SAME_APP, 0)] id_ = self.widget.connect('drag_data_received', - self._on_drag_data_received) + self._on_drag_data_received) self.handlers[id_] = self.widget self.widget.drag_dest_set(gtk.DEST_DEFAULT_MOTION | - gtk.DEST_DEFAULT_HIGHLIGHT | - gtk.DEST_DEFAULT_DROP, - self.dnd_list, gtk.gdk.ACTION_COPY) + gtk.DEST_DEFAULT_HIGHLIGHT | + gtk.DEST_DEFAULT_DROP, + self.dnd_list, gtk.gdk.ACTION_COPY) # Create textviews and connect signals self.conv_textview = ConversationTextview(self.account) 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.DEST_DEFAULT_MOTION | - gtk.DEST_DEFAULT_HIGHLIGHT | - gtk.DEST_DEFAULT_DROP, - self.dnd_list, gtk.gdk.ACTION_COPY) + gtk.DEST_DEFAULT_HIGHLIGHT | + gtk.DEST_DEFAULT_DROP, + self.dnd_list, gtk.gdk.ACTION_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') self.msg_textview = MessageTextView() id_ = self.msg_textview.connect('mykeypress', - self._on_message_textview_mykeypress_event) + self._on_message_textview_mykeypress_event) self.handlers[id_] = self.msg_textview self.msg_scrolledwindow.add(self.msg_textview) id_ = self.msg_textview.connect('key_press_event', - self._on_message_textview_key_press_event) + self._on_message_textview_key_press_event) self.handlers[id_] = self.msg_textview id_ = self.msg_textview.connect('size-request', self.size_request) self.handlers[id_] = self.msg_textview id_ = self.msg_textview.connect('populate_popup', - self.on_msg_textview_populate_popup) + self.on_msg_textview_populate_popup) self.handlers[id_] = self.msg_textview # Setup DND id_ = self.msg_textview.connect('drag_data_received', - self._on_drag_data_received) + self._on_drag_data_received) self.handlers[id_] = self.msg_textview self.msg_textview.drag_dest_set(gtk.DEST_DEFAULT_MOTION | - gtk.DEST_DEFAULT_HIGHLIGHT, - self.dnd_list, gtk.gdk.ACTION_COPY) + gtk.DEST_DEFAULT_HIGHLIGHT, + self.dnd_list, gtk.gdk.ACTION_COPY) self.update_font() @@ -474,7 +479,7 @@ # (so toggle works ok) img = self.xml.get_object('emoticons_button_image') img.set_from_file(os.path.join(gajim.DATA_DIR, 'emoticons', 'static', - 'smile.png')) + 'smile.png')) self.toggle_emoticons() # Attach speller @@ -893,12 +898,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') @@ -939,9 +955,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() @@ -949,16 +967,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 \ @@ -1370,7 +1400,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, 0).decode( - 'utf-8') + 'utf-8') + 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[0] + self.msg_textview.modify_base(gtk.STATE_NORMAL, gtk.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.STATE_NORMAL, + self.old_message_tv_color) + self.correcting = False pos += -1 if direction == 'up' else +1 if pos == -1: return @@ -1456,6 +1500,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') @@ -2318,7 +2364,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_ @@ -2328,13 +2375,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.STATE_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): @@ -2446,7 +2502,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 @@ -2511,7 +2567,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:

1 0

python-nbxmpp: add XEP-0308 namespace
by Yann Leboulanger 24 Apr '13

24 Apr '13

changeset 8e57e6d9beb6 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=8e57e6d9beb6 description: add XEP-0308 namespace diffstat: nbxmpp/protocol.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r c4e5f8d381e0 -r 8e57e6d9beb6 nbxmpp/protocol.py --- a/nbxmpp/protocol.py Sun Apr 07 22:07:13 2013 +0200 +++ b/nbxmpp/protocol.py Wed Apr 24 20:00:14 2013 +0200 @@ -63,6 +63,7 @@ NS_COMPONENT_1 = 'http://jabberd.jabberstudio.org/ns/component/1.0' NS_COMPRESS = 'http://jabber.org/protocol/compress' # XEP-0138 NS_CONFERENCE = 'jabber:x:conference' +NS_CORRECT = 'urn:xmpp:message-correct:0' # XEP-0308 NS_DATA = 'jabber:x:data' # XEP-0004 NS_DATA_MEDIA = 'urn:xmpp:media-element' # XEP-0221 NS_DELAY = 'jabber:x:delay'

1 0

gajim: typo
by Denis Fomin 22 Apr '13

22 Apr '13

changeset 15fb14070ab9 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=15fb14070ab9 description: typo diffstat: src/common/helpers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 513584411286 -r 15fb14070ab9 src/common/helpers.py --- a/src/common/helpers.py Mon Apr 22 18:07:45 2013 +0400 +++ b/src/common/helpers.py Mon Apr 22 18:09:58 2013 +0400 @@ -1470,7 +1470,7 @@ alt += '\n' alt += _('Image is too big') break - f.close() + f.close() return (mem, alt) def _get_img_proxy(attrs, proxy):

1 0

gajim: prevent warning
by Denis Fomin 22 Apr '13

22 Apr '13

changeset 513584411286 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=513584411286 description: prevent warning diffstat: src/common/helpers.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r a38d6f1f2ba5 -r 513584411286 src/common/helpers.py --- a/src/common/helpers.py Sun Apr 21 12:25:34 2013 +0400 +++ b/src/common/helpers.py Mon Apr 22 18:07:45 2013 +0400 @@ -1470,6 +1470,7 @@ alt += '\n' alt += _('Image is too big') break + f.close() return (mem, alt) def _get_img_proxy(attrs, proxy):

1 0

gajim: fix error win(set fill and expand for textview)
by Denis Fomin 21 Apr '13

21 Apr '13

changeset a38d6f1f2ba5 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=a38d6f1f2ba5 description: fix error win(set fill and expand for textview) diffstat: src/gtkexcepthook.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 43988a71ac81 -r a38d6f1f2ba5 src/gtkexcepthook.py --- a/src/gtkexcepthook.py Sun Apr 21 11:38:53 2013 +0400 +++ b/src/gtkexcepthook.py Sun Apr 21 12:25:34 2013 +0400 @@ -76,7 +76,7 @@ Gdk.Screen.height() / 4) expander = Gtk.Expander(label=_('Details')) expander.add(frame) - dialog.vbox.add(expander) + dialog.vbox.pack_start(expander, True, True, 0) dialog.set_resizable(True) # on expand the details the dialog remains centered on screen

1 0

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

21 Apr '13

changeset 105ef8b98877 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=105ef8b98877 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 e44b9ed46ad0 -r 105ef8b98877 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: fix reload emoticons
by Denis Fomin 21 Apr '13

21 Apr '13

changeset 43988a71ac81 in /home/hg/repos/gajim branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=43988a71ac81 description: fix reload emoticons diffstat: src/gui_interface.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r d01faf3e9dc0 -r 43988a71ac81 src/gui_interface.py --- a/src/gui_interface.py Sun Mar 24 10:56:43 2013 +0400 +++ b/src/gui_interface.py Sun Apr 21 11:38:53 2013 +0400 @@ -1964,7 +1964,8 @@ if need_reload: # we need to reload else that doesn't work when changing emoticon # set - reload(emoticons) + import imp + imp.reload(emoticons) emots = emoticons.emoticons for emot_filename in emots: emot_file = os.path.join(path, emot_filename)

1 0

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

14 Apr '13

changeset e44b9ed46ad0 in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e44b9ed46ad0 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 46663208bbde -r e44b9ed46ad0 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 @@ -2673,9 +2673,10 @@ table {entry1: value1} """ - def __init__(self, infos): + def __init__(self, infos, selectable=False): gtk.Table.__init__(self) self.infos = infos + self.selectable = selectable self.entries = {} self._draw_table() @@ -2688,6 +2689,8 @@ nbrow = 1 self.resize(rows = nbrow, columns = 2) label = gtk.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'): @@ -3797,10 +3800,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: start fixing last test. still a problem with sessions
by Yann Leboulanger 08 Apr '13

08 Apr '13

changeset 46663208bbde in /home/hg/repos/gajim branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=46663208bbde 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 35d25e610009 -r 46663208bbde 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 35d25e610009 -r 46663208bbde 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

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