Commits May 2011

commits@gajim.org

3 participants
119 discussions

gajim: let's be compatible with XEP-0184 v1.0.
by Yann Leboulanger 07 May '11

07 May '11

changeset 252bb3cf2c59 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=252bb3cf2c59 description: let's be compatible with XEP-0184 v1.0. diffstat: src/common/connection_handlers.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (17 lines): diff -r 11558e32ed1a -r 252bb3cf2c59 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed May 04 22:47:38 2011 +0200 +++ b/src/common/connection_handlers.py Sat May 07 08:44:15 2011 +0200 @@ -1005,8 +1005,11 @@ # We got our message's receipt if obj.receipt_received_tag and obj.session.control and \ gajim.config.get_per('accounts', self.name, 'request_receipt'): - obj.session.control.conv_textview.hide_xep0184_warning( - obj.receipt_received_tag.getAttr('id')) + id_ = obj.receipt_received_tag.getAttr('id') + if not id_: + # old XEP implementation + id_ = obj.id_ + obj.session.control.conv_textview.hide_xep0184_warning(id_) if obj.mtype == 'error': if not obj.msgtxt:

1 0

gajim: improve bosh connection to ejabberd 3.0
by Yann Leboulanger 04 May '11

04 May '11

changeset 11558e32ed1a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=11558e32ed1a description: improve bosh connection to ejabberd 3.0 diffstat: src/common/xmpp/bosh.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diffs (32 lines): diff -r daaf6e5da82e -r 11558e32ed1a src/common/xmpp/bosh.py --- a/src/common/xmpp/bosh.py Wed May 04 22:37:47 2011 +0200 +++ b/src/common/xmpp/bosh.py Wed May 04 22:47:38 2011 +0200 @@ -23,7 +23,7 @@ from transports_nb import NonBlockingTransport, NonBlockingHTTPBOSH,\ CONNECTED, CONNECTING, DISCONNECTED, DISCONNECTING,\ urisplit, DISCONNECT_TIMEOUT_SECONDS -from protocol import BOSHBody +from protocol import BOSHBody, Protocol, NS_CLIENT from simplexml import Node import logging @@ -190,13 +190,18 @@ # when called after HTTP response (Payload=None) and when there are already # some pending requests and no data to send, or when the socket is # disconnected, we do nothing - if payload is None and \ + if payload is None and \ total_pending_reqs > 0 and \ self.stanza_buffer == [] and \ self.prio_bosh_stanzas == [] or \ self.get_state()==DISCONNECTED: return + # Add xmlns to stanza to help ejabberd server + if payload and isinstance(payload, Protocol): + if not payload.getNamespace(): + payload.setNamespace(NS_CLIENT) + # now the payload is put to buffer and will be sent at some point self.append_stanza(payload)

1 0

gajim: fix arguments in pm events.
by Yann Leboulanger 04 May '11

04 May '11

changeset daaf6e5da82e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=daaf6e5da82e description: fix arguments in pm events. diffstat: src/groupchat_control.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r c134e560b7d3 -r daaf6e5da82e src/groupchat_control.py --- a/src/groupchat_control.py Wed May 04 19:50:05 2011 +0200 +++ b/src/groupchat_control.py Wed May 04 22:37:47 2011 +0200 @@ -1283,8 +1283,8 @@ else: # otherwise pass it off to the control to be queued self.on_private_message(nick, obj.msgtxt, obj.timestamp, - obj.xhtml, self, msg_id=obj.msg_id, encrypted=obj.encrypted, - displaymarking=obj.displaymarking) + obj.xhtml, self.session, msg_id=obj.msg_id, + encrypted=obj.encrypted, displaymarking=obj.displaymarking) def got_connected(self): # Make autorejoin stop.

1 0

gajim: fix minimized groupchat disappearing in roster. Fixes #6826
by Yann Leboulanger 04 May '11

04 May '11

changeset c134e560b7d3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c134e560b7d3 description: fix minimized groupchat disappearing in roster. Fixes #6826 diffstat: src/roster_window.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diffs (23 lines): diff -r fa56b48a71dd -r c134e560b7d3 src/roster_window.py --- a/src/roster_window.py Wed May 04 14:03:22 2011 +0200 +++ b/src/roster_window.py Wed May 04 19:50:05 2011 +0200 @@ -2499,12 +2499,13 @@ else: return - contact = gajim.contacts.get_contact_with_highest_priority(account, - obj.room_jid) - if contact: - contact.show = obj.show - self.draw_contact(obj.room_jid, account) - self.draw_group(_('Groupchats'), account) + if obj.nick == gc_ctrl.nick: + contact = gajim.contacts.get_contact_with_highest_priority(account, + obj.room_jid) + if contact: + contact.show = obj.show + self.draw_contact(obj.room_jid, account) + self.draw_group(_('Groupchats'), account) def _nec_roster_received(self, obj): if obj.received_from_server:

1 0

gajim: lighter import
by Yann Leboulanger 04 May '11

04 May '11

changeset fa56b48a71dd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=fa56b48a71dd description: lighter import diffstat: src/notify.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (32 lines): diff -r 2f333ecbfd68 -r fa56b48a71dd src/notify.py --- a/src/notify.py Wed May 04 14:02:38 2011 +0200 +++ b/src/notify.py Wed May 04 14:03:22 2011 +0200 @@ -29,7 +29,7 @@ import os import time -import dialogs +from dialogs import PopupNotificationWindow import gobject import gtkgui_helpers import gtk @@ -379,8 +379,8 @@ gajim.log.debug(str(e)) # Either nothing succeeded or the user wants old-style notifications - instance = dialogs.PopupNotificationWindow(event_type, jid, account, - msg_type, path_to_image, title, text) + instance = PopupNotificationWindow(event_type, jid, account, msg_type, + path_to_image, title, text) gajim.interface.roster.popup_notification_windows.append(instance) def on_pynotify_notification_clicked(notification, action): @@ -663,7 +663,7 @@ def notify_another_way(self, e): gajim.log.debug('Error when trying to use notification daemon: %s' % \ str(e)) - instance = dialogs.PopupNotificationWindow(self.event_type, self.jid, + instance = PopupNotificationWindow(self.event_type, self.jid, self.account, self.msg_type, self.path_to_image, self.title, self.text) gajim.interface.roster.popup_notification_windows.append(instance)

1 0

gajim: remove a useless import in common/gajim.py
by Yann Leboulanger 04 May '11

04 May '11

changeset 2f333ecbfd68 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2f333ecbfd68 description: remove a useless import in common/gajim.py diffstat: src/common/gajim.py | 3 +-- src/gui_interface.py | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diffs (31 lines): diff -r e496b6197204 -r 2f333ecbfd68 src/common/gajim.py --- a/src/common/gajim.py Wed May 04 08:50:34 2011 +0200 +++ b/src/common/gajim.py Wed May 04 14:02:38 2011 +0200 @@ -35,7 +35,6 @@ import xmpp import defs import common.ged -import notify interface = None # The actual interface (the gtk one for the moment) thread_interface = None # Interface to run a thread and then a callback @@ -106,7 +105,7 @@ events = Events() -notification = notify.Notification() +notification = None nicks = {} # list of our nick names in each account # should we block 'contact signed in' notifications for this account? diff -r e496b6197204 -r 2f333ecbfd68 src/gui_interface.py --- a/src/gui_interface.py Wed May 04 08:50:34 2011 +0200 +++ b/src/gui_interface.py Wed May 04 14:02:38 2011 +0200 @@ -2668,6 +2668,7 @@ # Creating Network Events Controller from common import nec gajim.nec = nec.NetworkEventsController() + gajim.notification = notify.Notification() self.create_core_handlers_list() self.register_core_handlers()

1 0

gajim: handle IMPORT_RES when verifying a GPG key. Fixes #6875
by Yann Leboulanger 04 May '11

04 May '11

changeset e496b6197204 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e496b6197204 description: handle IMPORT_RES when verifying a GPG key. Fixes #6875 diffstat: src/common/gnupg.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 76f9ccbd1369 -r e496b6197204 src/common/gnupg.py --- a/src/common/gnupg.py Sun May 01 22:09:50 2011 +0200 +++ b/src/common/gnupg.py Wed May 04 08:50:34 2011 +0200 @@ -688,6 +688,9 @@ pass elif key in ("PLAINTEXT", "PLAINTEXT_LENGTH"): pass + elif key == "IMPORT_RES": + # If auto-key-retrieve option is enabled, this can happen + pass elif key == "BADSIG": self.valid = False self.key_id, self.username = value.split(None, 1)

1 0

gajim: new way to handle incominf messages, new notification event.
by Yann Leboulanger 01 May '11

01 May '11

changeset 76f9ccbd1369 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=76f9ccbd1369 description: new way to handle incominf messages, new notification event. diffstat: plugins/snarl_notifications/plugin.py | 25 +---- src/chat_control.py | 2 +- src/common/connection_handlers.py | 1 + src/common/connection_handlers_events.py | 154 +++++++++++++++++++++++++++++ src/common/gajim.py | 3 + src/common/ged.py | 17 ++- src/common/nec.py | 8 +- src/disco.py | 1 - src/groupchat_control.py | 23 +++- src/notify.py | 27 +++++ src/roster_window.py | 40 +++++++ src/session.py | 162 ++++++++++++++++++------------ 12 files changed, 362 insertions(+), 101 deletions(-) diffs (truncated from 677 to 300 lines): diff -r 4522e590db27 -r 76f9ccbd1369 plugins/snarl_notifications/plugin.py --- a/plugins/snarl_notifications/plugin.py Sun May 01 18:31:44 2011 +0200 +++ b/plugins/snarl_notifications/plugin.py Sun May 01 22:09:50 2011 +0200 @@ -45,7 +45,7 @@ #self.gui_extension_points = {} #self.config_default_values = {} - self.events_handlers = {'NewMessage' : (ged.POSTCORE, self.newMessage)} + self.events_handlers = {'notification' : (ged.POSTCORE, self.notif)} @log_calls('SnarlNotificationsPlugin') def activate(self): @@ -56,29 +56,12 @@ pass @log_calls('SnarlNotificationsPlugin') - def newMessage(self, args): - event_name = "NewMessage" - data = args - account = data[0] - jid = data[1][0] - jid_without_resource = gajim.get_jid_without_resource(jid) - msg = data[1][1] - msg_type = data[1][4] - if msg_type == 'chat': - nickname = gajim.get_contact_name_from_jid(account, jid_without_resource) - elif msg_type in ('pm', 'groupchat'): - nickname = gajim.get_resource_from_jid(jid) - else: - nickname = jid - - print "Event '%s' occured. Arguments: %s\n\n===\n"%(event_name, pformat(args)) - print "Event '%s' occured. Arguments: \naccount = %s\njid = %s\nmsg = %s\nnickname = %s"%( - event_name, account, jid, msg, nickname) - + def notif(self, obj): + print "Event '%s' occured.\n\n===\n" % obj.popup_event_type #if PySnarl.snGetVersion() != False: #(major, minor) = PySnarl.snGetVersion() #print "Found Snarl version",str(major)+"."+str(minor),"running." - #PySnarl.snShowMessage(nickname, msg[:20]+'...') + #PySnarl.snShowMessage(obj.popup_title, obj.popup_text) #else: #print "Sorry Snarl does not appear to be running" diff -r 4522e590db27 -r 76f9ccbd1369 src/chat_control.py --- a/src/chat_control.py Sun May 01 18:31:44 2011 +0200 +++ b/src/chat_control.py Sun May 01 22:09:50 2011 +0200 @@ -2954,7 +2954,7 @@ if len(data) > 6 and isinstance(data[6], int): message_ids.append(data[6]) - if len(data) > 8: + if len(data) > 8 and not self.session: self.set_session(data[8]) if message_ids: gajim.logger.set_read_messages(message_ids) diff -r 4522e590db27 -r 76f9ccbd1369 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun May 01 18:31:44 2011 +0200 +++ b/src/common/connection_handlers.py Sun May 01 22:09:50 2011 +0200 @@ -1240,6 +1240,7 @@ gajim.nec.register_incoming_event(ArchivingErrorReceivedEvent) gajim.nec.register_incoming_event( ArchivingPreferencesChangedReceivedEvent) + gajim.nec.register_incoming_event(NotificationEvent) gajim.ged.register_event_handler('http-auth-received', ged.CORE, self._nec_http_auth_received) diff -r 4522e590db27 -r 76f9ccbd1369 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun May 01 18:31:44 2011 +0200 +++ b/src/common/connection_handlers_events.py Sun May 01 22:09:50 2011 +0200 @@ -35,6 +35,8 @@ from common.logger import LOG_DB_PATH from common.pep import SUPPORTED_PERSONAL_USER_EVENTS +import gtkgui_helpers + import logging log = logging.getLogger('gajim.c.connection_handlers_events') @@ -1888,3 +1890,155 @@ self.prompt = None self.prompt_jid = None return True + +class NotificationEvent(nec.NetworkIncomingEvent): + name = 'notification' + base_network_events = ['decrypted-message-received', 'gc-message-received'] + + def detect_type(self): + if self.base_event.name == 'decrypted-message-received': + self.notif_type = 'msg' + if self.base_event.name == 'gc-message-received': + self.notif_type = 'gc-msg' + + def get_focused(self): + self.control_focused = False + if self.control: + parent_win = self.control.parent_win + if parent_win and self.control == parent_win.get_active_control() \ + and parent_win.window.has_focus: + self.control_focused = True + + def handle_incoming_msg_event(self, msg_obj): + if not msg_obj.msgtxt: + return + self.jid = msg_obj.jid + if msg_obj.session: + self.control = msg_obj.session.control + else: + self.control = None + self.get_focused() + # This event has already been added to event list + if not self.control and len(gajim.events.get_events(self.conn.name, \ + self.jid, [msg_obj.mtype])) <= 1: + self.first_unread = True + + if msg_obj.mtype == 'pm': + nick = msg_obj.resource + else: + nick = gajim.get_name_from_jid(self.conn.name, self.jid) + + if self.first_unread: + self.sound_event = 'first_message_received' + elif self.control_focused: + self.sound_event = 'next_message_received_focused' + else: + self.sound_event = 'next_message_received_unfocused' + + if gajim.config.get('notification_preview_message'): + self.popup_text = msg_obj.msgtxt + if self.popup_text and (self.popup_text.startswith('/me ') or \ + self.popup_text.startswith('/me\n')): + self.popup_text = '* ' + nick + self.popup_text[3:] + else: + # We don't want message preview, do_preview = False + self.popup_text = '' + if msg_obj.mtype == 'normal': # single message + self.popup_event_type = _('New Single Message') + self.popup_image = 'gajim-single_msg_recv' + self.popup_title = _('New Single Message from %(nickname)s') % \ + {'nickname': nick} + elif msg_obj.mtype == 'pm': + self.popup_event_type = _('New Private Message') + self.popup_image = 'gajim-priv_msg_recv' + self.popup_title = _('New Private Message from group chat %s') % \ + msg_obj.jid + if self.popup_text: + self.popup_text = _('%(nickname)s: %(message)s') % \ + {'nickname': nick, 'message': self.popup_text} + else: + self.popup_text = _('Messaged by %(nickname)s') % \ + {'nickname': nick} + else: # chat message + self.popup_event_type = _('New Message') + self.popup_image = 'gajim-chat_msg_recv' + self.popup_title = _('New Message from %(nickname)s') % \ + {'nickname': nick} + + self.popup_image = gtkgui_helpers.get_icon_path(self.popup_image, 48) + + if not gajim.config.get('notify_on_new_message') or \ + not self.first_unread: + self.do_popup = False + elif gajim.config.get('autopopupaway'): + # always show notification + self.do_popup = True + elif gajim.connections[self.conn.name].connected in (2, 3): + # we're online or chat + self.do_popup = True + + if self.first_unread and helpers.allow_sound_notification( + self.conn.name, 'first_message_received'): + self.do_sound = True + elif not self.first_unread and self.control_focused and \ + helpers.allow_sound_notification(self.conn.name, + 'next_message_received_focused'): + self.do_sound = True + elif not self.first_unread and not self.control_focused and \ + helpers.allow_sound_notification(self.conn.name, + 'next_message_received_unfocused'): + self.do_sound = True + + def handle_incoming_gc_msg_event(self, msg_obj): + sound = msg_obj.msg_obj.gc_control.highlighting_for_message( + msg_obj.msgtxt, msg_obj.timestamp)[1] + self.do_sound = True + if sound == 'received': + self.sound_event = 'muc_message_received' + elif sound == 'highlight': + self.sound_event = 'muc_message_highlight' + else: + self.do_sound = False + + self.do_popup = False + + def handle_incoming_pres_event(self, msg_obj): + pass + + def generate(self): + # what's needed to compute output + self.conn = self.base_event.conn + self.control = None + self.control_focused = False + self.first_unread = False + + # For output + self.do_sound = False + self.sound_file = '' + self.sound_event = '' # gajim sound played if not sound_file is set + self.show_popup = False + + self.do_popup = False + self.popup_title = '' + self.popup_text = '' + self.popup_event_type = '' + self.popup_msg_type = '' + self.popup_image = '' + + self.do_command = False + self.command = '' + + self.open_chat = False + self.activate_urgency_hint = False + self.show_in_notification_area = False + self.show_in_roster = False + + self.detect_type() + + if self.notif_type == 'msg': + self.handle_incoming_msg_event(self.base_event) + elif self.notif_type == 'gc-msg': + self.handle_incoming_gc_msg_event(self.base_event) + elif self.notif_type == 'pres': + self.handle_incoming_pres_event(self.base_event) + return True diff -r 4522e590db27 -r 76f9ccbd1369 src/common/gajim.py --- a/src/common/gajim.py Sun May 01 18:31:44 2011 +0200 +++ b/src/common/gajim.py Sun May 01 22:09:50 2011 +0200 @@ -35,6 +35,7 @@ import xmpp import defs import common.ged +import notify interface = None # The actual interface (the gtk one for the moment) thread_interface = None # Interface to run a thread and then a callback @@ -105,6 +106,8 @@ events = Events() +notification = notify.Notification() + nicks = {} # list of our nick names in each account # should we block 'contact signed in' notifications for this account? # this is only for the first 30 seconds after we change our show diff -r 4522e590db27 -r 76f9ccbd1369 src/common/ged.py --- a/src/common/ged.py Sun May 01 18:31:44 2011 +0200 +++ b/src/common/ged.py Sun May 01 22:09:50 2011 +0200 @@ -27,12 +27,17 @@ import logging log = logging.getLogger('gajim.common.ged') -PRECORE = 30 -CORE = 40 -POSTCORE = 50 +PRECORE = 10 +CORE = 20 +POSTCORE = 30 +PREGUI = 40 +PREGUI1 = 50 GUI1 = 60 -GUI2 = 70 -POSTGUI = 80 +POSTGUI1 = 70 +PREGUI2 = 80 +GUI2 = 90 +POSTGUI2 = 100 +POSTGUI = 110 class GlobalEventsDispatcher(object): @@ -68,4 +73,4 @@ if event_name in self.handlers: for priority, handler in self.handlers[event_name]: if handler(*args, **kwargs): - return + return True diff -r 4522e590db27 -r 76f9ccbd1369 src/common/nec.py --- a/src/common/nec.py Sun May 01 18:31:44 2011 +0200 +++ b/src/common/nec.py Sun May 01 22:09:50 2011 +0200 @@ -58,8 +58,8 @@ def push_incoming_event(self, event_object): if event_object.generate(): - gajim.ged.raise_event(event_object.name, event_object) - self._generate_events_based_on_incoming_event(event_object) + if not gajim.ged.raise_event(event_object.name, event_object): + self._generate_events_based_on_incoming_event(event_object)

1 0

gajim: Fix the function that checks if we should log message. Fi...
by Yann Leboulanger 01 May '11

01 May '11

changeset 4522e590db27 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4522e590db27 description: Fix the function that checks if we should log message. Fixes #6873 diffstat: src/common/stanza_session.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 3fc441178f53 -r 4522e590db27 src/common/stanza_session.py --- a/src/common/stanza_session.py Fri Apr 29 21:32:17 2011 +0200 +++ b/src/common/stanza_session.py Sun May 01 18:31:44 2011 +0200 @@ -78,7 +78,8 @@ self.negotiated = {} def is_loggable(self): - return self.loggable and gajim.config.should_log(self.conn.name, self.jid) + return self.loggable and gajim.config.should_log(self.conn.name, + self.jid.getStripped()) def get_to(self): to = str(self.jid)

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2011