Commits August 2011

commits@gajim.org

3 participants
99 discussions

gajim: ability to connect to a server that doesn't support roste...
by Yann Leboulanger 09 Aug '11

09 Aug '11

changeset a9fb1c99aff3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a9fb1c99aff3 description: ability to connect to a server that doesn't support roster, and hide the correcponding features. Fixes #6745 diffstat: src/chat_control.py | 3 ++- src/common/connection.py | 5 +++-- src/common/connection_handlers.py | 9 +++++++++ src/conversation_textview.py | 7 ++++--- src/groupchat_control.py | 3 ++- src/gui_menu_builder.py | 6 +++++- src/roster_window.py | 7 +++++-- 7 files changed, 30 insertions(+), 10 deletions(-) diffs (129 lines): diff -r cbffea9f7818 -r a9fb1c99aff3 src/chat_control.py --- a/src/chat_control.py Tue Aug 09 17:13:05 2011 +0200 +++ b/src/chat_control.py Tue Aug 09 17:14:13 2011 +0200 @@ -1669,7 +1669,8 @@ # Add to roster if not isinstance(self.contact, GC_Contact) \ - and _('Not in Roster') in self.contact.groups: + and _('Not in Roster') in self.contact.groups and \ + gajim.connections[self.account].roster_supported: self._add_to_roster_button.show() else: self._add_to_roster_button.hide() diff -r cbffea9f7818 -r a9fb1c99aff3 src/common/connection.py --- a/src/common/connection.py Tue Aug 09 17:13:05 2011 +0200 +++ b/src/common/connection.py Tue Aug 09 17:14:13 2011 +0200 @@ -155,6 +155,7 @@ self.private_storage_supported = False self.archiving_supported = False self.archive_pref_supported = False + self.roster_supported = True self.muc_jid = {} # jid of muc server for each transport type self._stun_servers = [] # STUN servers of our jabber server @@ -511,14 +512,14 @@ raise NotImplementedError def update_contact(self, jid, name, groups): - if self.connection: + if self.connection and self.roster_supported: self.connection.getRoster().setItem(jid=jid, name=name, groups=groups) def update_contacts(self, contacts): """ Update multiple roster items """ - if self.connection: + if self.connection and self.roster_supported: self.connection.getRoster().setItemMulti(contacts) def new_account(self, name, config, sync=False): diff -r cbffea9f7818 -r a9fb1c99aff3 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Aug 09 17:13:05 2011 +0200 +++ b/src/common/connection_handlers.py Tue Aug 09 17:14:13 2011 +0200 @@ -550,6 +550,15 @@ roster = self.connection.getRoster(force=True) roster.setRaw(roster_data) self._getRoster() + elif iq_obj.getType() == 'error': + self.roster_supported = False + self.discoverItems(gajim.config.get_per('accounts', self.name, + 'hostname'), id_prefix='Gajim_') + if gajim.config.get_per('accounts', self.name, + 'use_ft_proxies'): + self.discover_ft_proxies() + gajim.nec.push_incoming_event(RosterReceivedEvent(None, + conn=self)) elif self.awaiting_answers[id_][0] == PRIVACY_ARRIVED: if iq_obj.getType() != 'error': self.privacy_rules_supported = True diff -r cbffea9f7818 -r a9fb1c99aff3 src/conversation_textview.py --- a/src/conversation_textview.py Tue Aug 09 17:13:05 2011 +0200 +++ b/src/conversation_textview.py Tue Aug 09 17:14:13 2011 +0200 @@ -915,9 +915,10 @@ self.on_join_group_chat_menuitem_activate, text) self.handlers[id_] = childs[6] - if self.account: - id_ = childs[7].connect('activate', self.on_add_to_roster_activate, - text) + if self.account and gajim.connections[self.account].\ + roster_supported: + id_ = childs[7].connect('activate', + self.on_add_to_roster_activate, text) self.handlers[id_] = childs[7] childs[7].show() # show add to roster menuitem else: diff -r cbffea9f7818 -r a9fb1c99aff3 src/groupchat_control.py --- a/src/groupchat_control.py Tue Aug 09 17:13:05 2011 +0200 +++ b/src/groupchat_control.py Tue Aug 09 17:14:13 2011 +0200 @@ -2398,7 +2398,8 @@ item = xml.get_object('add_to_roster_menuitem') our_jid = gajim.get_jid_from_account(self.account) - if not jid or jid == our_jid: + if not jid or jid == our_jid or not gajim.connections[self.account].\ + roster_supported: item.set_sensitive(False) else: id_ = item.connect('activate', self.on_add_to_roster, jid) diff -r cbffea9f7818 -r a9fb1c99aff3 src/gui_menu_builder.py --- a/src/gui_menu_builder.py Tue Aug 09 17:13:05 2011 +0200 +++ b/src/gui_menu_builder.py Tue Aug 09 17:14:13 2011 +0200 @@ -425,13 +425,17 @@ revoke_auth_menuitem.connect('activate', roster.revoke_auth, jid, account) - else: + elif gajim.connections[account].roster_supported: # contact is in group 'Not in Roster' add_to_roster_menuitem.set_no_show_all(False) subscription_menuitem.set_sensitive(False) add_to_roster_menuitem.connect('activate', roster.on_add_to_roster, contact, account) + else: + add_to_roster_menuitem.hide() + add_to_roster_menuitem.set_no_show_all(True) + subscription_menuitem.set_sensitive(False) set_custom_avatar_menuitem.connect('activate', roster.on_set_custom_avatar_activate, contact, account) diff -r cbffea9f7818 -r a9fb1c99aff3 src/roster_window.py --- a/src/roster_window.py Tue Aug 09 17:13:05 2011 +0200 +++ b/src/roster_window.py Tue Aug 09 17:14:13 2011 +0200 @@ -5396,8 +5396,11 @@ edit_account_menuitem.connect('activate', self.on_edit_account, account) - add_contact_menuitem.connect('activate', self.on_add_new_contact, - account) + if gajim.connections[account].roster_supported: + add_contact_menuitem.connect('activate', + self.on_add_new_contact, account) + else: + add_contact_menuitem.set_sensitive(False) service_discovery_menuitem.connect('activate', self.on_service_disco_menuitem_activate, account) hostname = gajim.config.get_per('accounts', account, 'hostname')

1 0

gajim: change a var name
by Yann Leboulanger 09 Aug '11

09 Aug '11

changeset cbffea9f7818 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cbffea9f7818 description: change a var name diffstat: src/common/xmpp/roster_nb.py | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diffs (59 lines): diff -r b91124d65d95 -r cbffea9f7818 src/common/xmpp/roster_nb.py --- a/src/common/xmpp/roster_nb.py Tue Aug 09 11:38:58 2011 +0200 +++ b/src/common/xmpp/roster_nb.py Tue Aug 09 17:13:05 2011 +0200 @@ -45,7 +45,7 @@ PlugIn.__init__(self) self.version = version self._data = {} - self.set=None + self._set=None self._exported_methods=[self.getRoster] self.received_from_server = False @@ -54,8 +54,8 @@ Request roster from server if it were not yet requested (or if the 'force' argument is set) """ - if self.set is None: - self.set = 0 + if self._set is None: + self._set = 0 elif not force: return @@ -100,7 +100,7 @@ if group.getData() not in self._data[jid]['groups']: self._data[jid]['groups'].append(group.getData()) self._data[self._owner.User+'@'+self._owner.Server]={'resources': {}, 'name': None, 'ask': None, 'subscription': None, 'groups': None,} - self.set=1 + self._set=1 # Looks like we have a workaround # raise NodeProcessed # a MUST. Otherwise you'll get back an <iq type='error'/> @@ -323,7 +323,7 @@ 'subscription': None, 'groups': None } - self.set = 1 + self._set = 1 def plugin(self, owner, request=1): """ @@ -340,7 +340,7 @@ def _on_roster_set(self, data): if data: self._owner.Dispatcher.ProcessNonBlocking(data) - if not self.set: + if not self._set: return if not self._owner: # Connection has been closed by receiving a <stream:error> for ex, @@ -356,7 +356,7 @@ Request roster from server if neccessary and returns self """ return_self = True - if not self.set: + if not self._set: self.on_ready = on_ready self._owner.onreceive(self._on_roster_set) return_self = False

1 0

gajim: pres_obj.show is already unicode version of show
by Yann Leboulanger 09 Aug '11

09 Aug '11

changeset b91124d65d95 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b91124d65d95 description: pres_obj.show is already unicode version of show diffstat: src/common/connection_handlers_events.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 55a891e28423 -r b91124d65d95 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Aug 08 21:51:31 2011 +0200 +++ b/src/common/connection_handlers_events.py Tue Aug 09 11:38:58 2011 +0200 @@ -2104,8 +2104,7 @@ {'nick': gajim.get_name_from_jid(account, self.jid)} self.popup_text = _('%(nick)s is now %(status)s') % \ {'nick': gajim.get_name_from_jid(account, self.jid),\ - 'status': helpers.get_uf_show( - gajim.SHOW_LIST[pres_obj.show])} + 'status': helpers.get_uf_show(pres_obj.show)} if pres_obj.status: text = text + " : " + pres_obj.status self.popup_event_type = _('Contact Changed Status')

1 0

gajim: don't play sound twice when receiving a captcha
by Yann Leboulanger 08 Aug '11

08 Aug '11

changeset 2326082db614 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2326082db614 description: don't play sound twice when receiving a captcha diffstat: src/groupchat_control.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 8c7db3a33efa -r 2326082db614 src/groupchat_control.py --- a/src/groupchat_control.py Mon Aug 08 21:49:29 2011 +0200 +++ b/src/groupchat_control.py Mon Aug 08 21:50:38 2011 +0200 @@ -972,7 +972,6 @@ self.parent_win.redraw_tab(self, 'attention') else: self.attention_flag = True - helpers.play_sound('muc_message_received') if '100' in obj.status_code: # Room is not anonymous self.is_anonymous = False

1 0

gajim: don't play sound when we receive the message we just sent...
by Yann Leboulanger 08 Aug '11

08 Aug '11

changeset 55a891e28423 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=55a891e28423 description: don't play sound when we receive the message we just sent in groupchat. Fixes #6938 diffstat: src/common/connection_handlers_events.py | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diffs (24 lines): diff -r 2326082db614 -r 55a891e28423 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Aug 08 21:50:38 2011 +0200 +++ b/src/common/connection_handlers_events.py Mon Aug 08 21:51:31 2011 +0200 @@ -2004,11 +2004,15 @@ 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' + + if msg_obj.nickname != msg_obj.msg_obj.gc_control.nick: + 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 else: self.do_sound = False

1 0

gajim: fix indentation error
by Yann Leboulanger 08 Aug '11

08 Aug '11

changeset 8c7db3a33efa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8c7db3a33efa description: fix indentation error diffstat: src/gui_interface.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diffs (20 lines): diff -r 1dbdd1122a23 -r 8c7db3a33efa src/gui_interface.py --- a/src/gui_interface.py Mon Aug 08 18:45:21 2011 +0200 +++ b/src/gui_interface.py Mon Aug 08 21:49:29 2011 +0200 @@ -268,11 +268,11 @@ if gc_control.error_dialog: gc_control.error_dialog.destroy() - gc_control.error_dialog = dialogs.InputDialog(_('Password Required'), - _('A Password is required to join the room %s. Please type it.') % \ - room_jid, is_modal=False, ok_handler=on_ok, - cancel_handler=on_cancel) - gc_control.error_dialog.input_entry.set_visibility(False) + gc_control.error_dialog = dialogs.InputDialog(_('Password Required'), + _('A Password is required to join the room %s. Please type it.') % \ + room_jid, is_modal=False, ok_handler=on_ok, + cancel_handler=on_cancel) + gc_control.error_dialog.input_entry.set_visibility(False) def handle_event_gc_presence(self, obj): gc_control = obj.gc_control

1 0

gajim: remove old notification code
by Yann Leboulanger 08 Aug '11

08 Aug '11

changeset 1dbdd1122a23 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1dbdd1122a23 description: remove old notification code diffstat: src/notify.py | 163 ---------------------------------------------------------- 1 files changed, 0 insertions(+), 163 deletions(-) diffs (173 lines): diff -r b790684210bf -r 1dbdd1122a23 src/notify.py --- a/src/notify.py Mon Aug 08 18:45:06 2011 +0200 +++ b/src/notify.py Mon Aug 08 18:45:21 2011 +0200 @@ -72,169 +72,6 @@ return False return gajim.config.get('trayicon_notification_on_events') -def notify(event, jid, account, parameters): - """ - Check what type of notifications we want, depending on basic and the - advanced configuration of notifications and do these notifications; - """ - # First, find what notifications we want - do_popup = False - do_sound = False - do_cmd = False - if event == 'status_change': - new_show = parameters[0] - status_message = parameters[1] - # Default: No popup for status change - elif event == 'contact_connected': - status_message = parameters - j = gajim.get_jid_without_resource(jid) - server = gajim.get_server_from_jid(j) - account_server = account + '/' + server - block_transport = False - if account_server in gajim.block_signed_in_notifications and \ - gajim.block_signed_in_notifications[account_server]: - block_transport = True - if helpers.allow_showing_notification(account, 'notify_on_signin') and \ - not gajim.block_signed_in_notifications[account] and \ - not block_transport: - do_popup = True - if gajim.config.get_per('soundevents', 'contact_connected', - 'enabled') and not gajim.block_signed_in_notifications[account] and \ - not block_transport and helpers.allow_sound_notification(account, - event): - do_sound = True - elif event == 'contact_disconnected': - status_message = parameters - if helpers.allow_showing_notification(account, 'notify_on_signout'): - do_popup = True - if gajim.config.get_per('soundevents', 'contact_disconnected', - 'enabled') and helpers.allow_sound_notification(account, event): - do_sound = True - elif event == 'new_message': - message_type = parameters[0] - is_first_message = parameters[1] - nickname = parameters[2] - if gajim.config.get('notification_preview_message'): - message = parameters[3] - if message.startswith('/me ') or message.startswith('/me\n'): - message = '* ' + nickname + message[3:] - else: - # We don't want message preview, do_preview = False - message = '' - focused = parameters[4] - if helpers.allow_showing_notification(account, 'notify_on_new_message', - is_first_message): - do_popup = True - if is_first_message and helpers.allow_sound_notification(account, - 'first_message_received'): - do_sound = True - elif not is_first_message and focused and \ - helpers.allow_sound_notification(account, - 'next_message_received_focused'): - do_sound = True - elif not is_first_message and not focused and \ - helpers.allow_sound_notification(account, - 'next_message_received_unfocused'): - do_sound = True - else: - print '*Event not implemeted yet*' - - # Do the wanted notifications - if do_popup: - if event in ('contact_connected', 'contact_disconnected', - 'status_change'): # Common code for popup for these three events - if event == 'contact_disconnected': - show_image = 'offline.png' - suffix = '_notif_size_bw' - else: # Status Change or Connected - # FIXME: for status change, - # we don't always 'online.png', but we - # first need 48x48 for all status - show_image = 'online.png' - suffix = '_notif_size_colored' - transport_name = gajim.get_transport_name_from_jid(jid) - img_path = None - if transport_name: - img_path = os.path.join(helpers.get_transport_path( - transport_name), '48x48', show_image) - if not img_path or not os.path.isfile(img_path): - iconset = gajim.config.get('iconset') - img_path = os.path.join(helpers.get_iconset_path(iconset), - '48x48', show_image) - path = gtkgui_helpers.get_path_to_generic_or_avatar(img_path, - jid=jid, suffix=suffix) - if event == 'status_change': - title = _('%(nick)s Changed Status') % \ - {'nick': gajim.get_name_from_jid(account, jid)} - text = _('%(nick)s is now %(status)s') % \ - {'nick': gajim.get_name_from_jid(account, jid),\ - 'status': helpers.get_uf_show(gajim.SHOW_LIST[new_show])} - if status_message: - text = text + " : " + status_message - popup(_('Contact Changed Status'), jid, account, - path_to_image=path, title=title, text=text) - elif event == 'contact_connected': - title = _('%(nickname)s Signed In') % \ - {'nickname': gajim.get_name_from_jid(account, jid)} - text = '' - if status_message: - text = status_message - popup(_('Contact Signed In'), jid, account, - path_to_image=path, title=title, text=text) - elif event == 'contact_disconnected': - title = _('%(nickname)s Signed Out') % \ - {'nickname': gajim.get_name_from_jid(account, jid)} - text = '' - if status_message: - text = status_message - popup(_('Contact Signed Out'), jid, account, - path_to_image=path, title=title, text=text) - elif event == 'new_message': - if message_type == 'normal': # single message - event_type = _('New Single Message') - img_name = 'gajim-single_msg_recv' - title = _('New Single Message from %(nickname)s') % \ - {'nickname': nickname} - text = message - elif message_type == 'pm': # private message - event_type = _('New Private Message') - room_name = gajim.get_nick_from_jid(jid) - img_name = 'gajim-priv_msg_recv' - title = _('New Private Message from group chat %s') % room_name - if message: - text = _('%(nickname)s: %(message)s') % \ - {'nickname': nickname, 'message': message} - else: - text = _('Messaged by %(nickname)s') % \ - {'nickname': nickname} - - else: # chat message - event_type = _('New Message') - img_name = 'gajim-chat_msg_recv' - title = _('New Message from %(nickname)s') % \ - {'nickname': nickname} - text = message - img_path = gtkgui_helpers.get_icon_path(img_name, 48) - popup(event_type, jid, account, message_type, - path_to_image=img_path, title=title, text=text) - - if do_sound: - snd_file = None - snd_event = None # If not snd_file, play the event - if event == 'new_message': - if is_first_message: - snd_event = 'first_message_received' - elif focused: - snd_event = 'next_message_received_focused' - else: - snd_event = 'next_message_received_unfocused' - elif event in ('contact_connected', 'contact_disconnected'): - snd_event = event - if snd_file: - helpers.play_sound_file(snd_file) - if snd_event: - helpers.play_sound(snd_event) - def popup(event_type, jid, account, msg_type='', path_to_image=None, title=None, text=None): """

1 0

gajim: add tooltip to trigger plugin in configuration window
by Yann Leboulanger 08 Aug '11

08 Aug '11

changeset b790684210bf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b790684210bf description: add tooltip to trigger plugin in configuration window diffstat: plugins/triggers/config_dialog.ui | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 432ca13f1755 -r b790684210bf plugins/triggers/config_dialog.ui --- a/plugins/triggers/config_dialog.ui Mon Aug 08 18:44:32 2011 +0200 +++ b/plugins/triggers/config_dialog.ui Mon Aug 08 18:45:06 2011 +0200 @@ -264,6 +264,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="no_show_all">True</property> + <property name="tooltip_text" translatable="yes">comma separated list</property> <signal name="changed" handler="on_recipient_list_entry_changed"/> </object> <packing>

1 0

gajim: handle presence events through Notifiction event
by Yann Leboulanger 08 Aug '11

08 Aug '11

changeset 432ca13f1755 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=432ca13f1755 description: handle presence events through Notifiction event diffstat: src/common/connection_handlers_events.py | 117 ++++++++++++++++++++++++++++++- src/gui_interface.py | 37 --------- 2 files changed, 114 insertions(+), 40 deletions(-) diffs (217 lines): diff -r 9ecbb69c7bde -r 432ca13f1755 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Aug 02 10:38:51 2011 +0200 +++ b/src/common/connection_handlers_events.py Mon Aug 08 18:44:32 2011 +0200 @@ -20,6 +20,7 @@ import datetime import sys +import os from time import (localtime, time as time_time) from calendar import timegm import hmac @@ -1898,13 +1899,16 @@ class NotificationEvent(nec.NetworkIncomingEvent): name = 'notification' - base_network_events = ['decrypted-message-received', 'gc-message-received'] + base_network_events = ['decrypted-message-received', 'gc-message-received', + 'presence-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' + if self.base_event.name == 'presence-received': + self.notif_type = 'pres' def get_focused(self): self.control_focused = False @@ -1949,11 +1953,13 @@ # We don't want message preview, do_preview = False self.popup_text = '' if msg_obj.mtype == 'normal': # single message + self.popup_msg_type = 'normal' 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_msg_type = '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') % \ @@ -1965,6 +1971,7 @@ self.popup_text = _('Messaged by %(nickname)s') % \ {'nickname': nick} else: # chat message + self.popup_msg_type = 'chat' self.popup_event_type = _('New Message') self.popup_image = 'gajim-chat_msg_recv' self.popup_title = _('New Message from %(nickname)s') % \ @@ -2007,12 +2014,116 @@ self.do_popup = False - def handle_incoming_pres_event(self, msg_obj): - pass + def handle_incoming_pres_event(self, pres_obj): + if gajim.jid_is_transport(pres_obj.jid): + return True + account = pres_obj.conn.name + self.jid = pres_obj.jid + resource = pres_obj.resource or '' + # It isn't an agent + for c in pres_obj.contact_list: + if c.resource == resource: + # we look for other connected resources + continue + if c.show not in ('offline', 'error'): + return True + + + # no other resource is connected, let's look in metacontacts + family = gajim.contacts.get_metacontacts_family(account, self.jid) + for info in family: + acct_ = info['account'] + jid_ = info['jid'] + c_ = gajim.contacts.get_contact_with_highest_priority(acct_, jid_) + if not c_: + continue + if c_.jid == self.jid: + continue + if c_.show not in ('offline', 'error'): + return True + + if pres_obj.old_show < 2 and pres_obj.new_show > 1: + event = 'contact_connected' + show_image = 'online.png' + suffix = '_notif_size_colored' + server = gajim.get_server_from_jid(self.jid) + account_server = account + '/' + server + block_transport = False + if account_server in gajim.block_signed_in_notifications and \ + gajim.block_signed_in_notifications[account_server]: + block_transport = True + if helpers.allow_showing_notification(account, 'notify_on_signin') \ + and not gajim.block_signed_in_notifications[account] and \ + not block_transport: + self.do_popup = True + if gajim.config.get_per('soundevents', 'contact_connected', + 'enabled') and not gajim.block_signed_in_notifications[account] and\ + not block_transport and helpers.allow_sound_notification(account, + 'contact_connected'): + self.sound_event = event + self.do_sound = True + + elif pres_obj.old_show > 1 and pres_obj.new_show < 2: + event = 'contact_disconnected' + show_image = 'offline.png' + suffix = '_notif_size_bw' + if helpers.allow_showing_notification(account, 'notify_on_signout'): + self.do_popup = True + if gajim.config.get_per('soundevents', 'contact_disconnected', + 'enabled') and helpers.allow_sound_notification(account, event): + self.sound_event = event + self.do_sound = True + # Status change (not connected/disconnected or error (<1)) + elif pres_obj.new_show > 1: + event = 'status_change' + # FIXME: we don't always 'online.png', but we first need 48x48 for + # all status + show_image = 'online.png' + suffix = '_notif_size_colored' + else: + return True + + transport_name = gajim.get_transport_name_from_jid(self.jid) + img_path = None + if transport_name: + img_path = os.path.join(helpers.get_transport_path( + transport_name), '48x48', show_image) + if not img_path or not os.path.isfile(img_path): + iconset = gajim.config.get('iconset') + img_path = os.path.join(helpers.get_iconset_path(iconset), + '48x48', show_image) + self.popup_image = gtkgui_helpers.get_path_to_generic_or_avatar( + img_path, jid=self.jid, suffix=suffix) + + if event == 'status_change': + self.popup_title = _('%(nick)s Changed Status') % \ + {'nick': gajim.get_name_from_jid(account, self.jid)} + self.popup_text = _('%(nick)s is now %(status)s') % \ + {'nick': gajim.get_name_from_jid(account, self.jid),\ + 'status': helpers.get_uf_show( + gajim.SHOW_LIST[pres_obj.show])} + if pres_obj.status: + text = text + " : " + pres_obj.status + self.popup_event_type = _('Contact Changed Status') + elif event == 'contact_connected': + self.popup_title = _('%(nickname)s Signed In') % \ + {'nickname': gajim.get_name_from_jid(account, self.jid)} + self.popup_text = '' + if pres_obj.status: + self.popup_text = pres_obj.status + self.popup_event_type = _('Contact Signed In') + elif event == 'contact_disconnected': + self.popup_title = _('%(nickname)s Signed Out') % \ + {'nickname': gajim.get_name_from_jid(account, self.jid)} + self.popup_text = '' + if pres_obj.status: + self.popup_text = pres_obj.status + self.popup_event_type = _('Contact Signed Out') def generate(self): # what's needed to compute output self.conn = self.base_event.conn + self.jid = '' self.control = None self.control_focused = False self.first_unread = False diff -r 9ecbb69c7bde -r 432ca13f1755 src/gui_interface.py --- a/src/gui_interface.py Tue Aug 02 10:38:51 2011 +0200 +++ b/src/gui_interface.py Mon Aug 08 18:44:32 2011 +0200 @@ -347,43 +347,6 @@ gobject.timeout_add_seconds(30, self.unblock_signed_in_notifications, account_jid) - else: - # It isn't an agent - # Notifications - obj.show_notif = True - for c in obj.contact_list: - if c.resource == resource: - # we look for other connected resources - continue - if c.show not in ('offline', 'error'): - obj.show_notif = False - break - if obj.show_notif: - # no other resource is connected, let's look in metacontacts - family = gajim.contacts.get_metacontacts_family(account, - jid) - for info in family: - acct_ = info['account'] - jid_ = info['jid'] - c_ = gajim.contacts.get_contact_with_highest_priority( - acct_, jid_) - if not c_: - continue - if c_.show not in ('offline', 'error'): - obj.show_notif = False - break - if obj.show_notif: - if obj.old_show < 2 and obj.new_show > 1: - notify.notify('contact_connected', jid, account, status) - - elif obj.old_show > 1 and obj.new_show < 2: - notify.notify('contact_disconnected', jid, account, status) - # Status change (not connected/disconnected or - # error (<1)) - elif obj.new_show > 1: - notify.notify('status_change', jid, account, [obj.new_show, - status]) - highest = gajim.contacts.get_contact_with_highest_priority(account, jid) is_highest = (highest and highest.resource == resource)

1 0

gajim: commenting experimental code
by Jefry Lagrange 04 Aug '11

04 Aug '11

changeset 7e9b071b6e59 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7e9b071b6e59 description: commenting experimental code diffstat: src/common/jingle_ft.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (31 lines): diff -r 5ab4d5d22ccc -r 7e9b071b6e59 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Mon Aug 01 23:13:56 2011 -0400 +++ b/src/common/jingle_ft.py Thu Aug 04 17:02:55 2011 -0400 @@ -112,15 +112,15 @@ con.OpenStream( self.transport.sid, self.session.peerjid, fp, blocksize=4096) raise xmpp.NodeProcessed - + ''' self.file_props['streamhosts'] = self.transport.remote_candidates for host in self.file_props['streamhosts']: host['initiator'] = self.session.initiator host['target'] = self.session.responder - + ''' response = stanza.buildReply('result') con.connection.send(response) - + ''' if not gajim.socks5queue.get_file_props( self.session.connection.name, self.file_props['sid']): gajim.socks5queue.add_file_props(self.session.connection.name, @@ -131,7 +131,7 @@ gajim.socks5queue.connect_to_hosts(self.session.connection.name, self.file_props['sid'], self.send_candidate_used, self._on_connect_error, fingerprint=fingerprint) - + ''' raise xmpp.NodeProcessed def __on_session_terminate(self, stanza, content, error, action):

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2011