Commits December 2010

commits@gajim.org

2 participants
81 discussions

gajim: DLFCN and dl will be loaded immediately. Fixes #6741
by Denis Fomin 31 Dec '10

31 Dec '10

changeset af490f29e053 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=af490f29e053 description: DLFCN and dl will be loaded immediately. Fixes #6741 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9d4d9b3d7400 -r af490f29e053 src/gajim.py --- a/src/gajim.py Thu Dec 30 19:02:12 2010 +0100 +++ b/src/gajim.py Fri Dec 31 16:37:14 2010 +0300 @@ -40,7 +40,7 @@ demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', 'logging.NullHandler', 'dbus.glib', 'dbus.service', 'command_system.implementation.standard', 'OpenSSL.SSL', 'OpenSSL.crypto', - 'common.sleepy'] + 'common.sleepy', 'DLFCN', 'dl'] import os import sys

1 0

gajim: [elghinn] Fix var name that prevent account registration
by Yann Leboulanger 30 Dec '10

30 Dec '10

changeset 9d4d9b3d7400 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9d4d9b3d7400 description: [elghinn] Fix var name that prevent account registration diffstat: src/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2258fef7fc35 -r 9d4d9b3d7400 src/config.py --- a/src/config.py Thu Dec 23 17:51:26 2010 +0100 +++ b/src/config.py Thu Dec 30 19:02:12 2010 +0100 @@ -3744,7 +3744,7 @@ ' be invalid.\nSSL Error: %(error)s\n' 'Do you still want to connect to this server?') % { 'hostname': hostname, 'error': obj.ssl_msg}) - if obj.ssl_err in (18, 27): + if obj.errnum in (18, 27): text = _('Add this certificate to the list of trusted ' 'certificates.\nSHA1 fingerprint of the certificate:\n%s') \ % obj.ssl_fingerprint

1 0

gajim: redraw chat buttons when we get caps information. Fixes #...
by Yann Leboulanger 23 Dec '10

23 Dec '10

changeset 2258fef7fc35 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2258fef7fc35 description: redraw chat buttons when we get caps information. Fixes #6114 diffstat: src/chat_control.py | 9 +++++++++ src/groupchat_control.py | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diffs (58 lines): diff -r eced5460e91a -r 2258fef7fc35 src/chat_control.py --- a/src/chat_control.py Thu Dec 23 13:59:28 2010 +0100 +++ b/src/chat_control.py Thu Dec 23 17:51:26 2010 +0100 @@ -1605,6 +1605,8 @@ self._nec_failed_decrypt) gajim.ged.register_event_handler('chatstate-received', ged.GUI1, self._nec_chatstate_received) + gajim.ged.register_event_handler('caps-received', ged.GUI1, + self._nec_caps_received) # PluginSystem: adding GUI extension point for this ChatControl # instance object @@ -2597,6 +2599,8 @@ self._nec_failed_decrypt) gajim.ged.remove_event_handler('chatstate-received', ged.GUI1, self._nec_chatstate_received) + gajim.ged.remove_event_handler('caps-received', ged.GUI1, + self._nec_caps_received) self.send_chatstate('gone', self.contact) self.contact.chatstate = None @@ -2673,6 +2677,11 @@ # update chatstate in tab for this chat self.parent_win.redraw_tab(self, self.contact.chatstate) + def _nec_caps_received(self, obj): + if obj.conn.name != self.account or obj.jid != self.contact.jid: + return + self.update_ui() + def set_control_active(self, state): ChatControlBase.set_control_active(self, state) # send chatstate inactive to the one we're leaving diff -r eced5460e91a -r 2258fef7fc35 src/groupchat_control.py --- a/src/groupchat_control.py Thu Dec 23 13:59:28 2010 +0100 +++ b/src/groupchat_control.py Thu Dec 23 17:51:26 2010 +0100 @@ -149,18 +149,18 @@ ChatControl.__init__(self, parent_win, contact, account, session) self.TYPE_ID = 'pm' gajim.ged.register_event_handler('caps-received', ged.GUI1, - self._nec_caps_received) + self._nec_caps_received_pm) gajim.ged.register_event_handler('gc-presence-received', ged.GUI1, self._nec_gc_presence_received) def shutdown(self): super(PrivateChatControl, self).shutdown() gajim.ged.remove_event_handler('caps-received', ged.GUI1, - self._nec_caps_received) + self._nec_caps_received_pm) gajim.ged.remove_event_handler('gc-presence-received', ged.GUI1, self._nec_gc_presence_received) - def _nec_caps_received(self, obj): + def _nec_caps_received_pm(self, obj): if obj.conn.name != self.account or \ obj.fjid != self.gc_contact.get_full_jid(): return

1 0

gajim: fix demndimport with ipython
by Yann Leboulanger 23 Dec '10

23 Dec '10

changeset eced5460e91a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=eced5460e91a description: fix demndimport with ipython diffstat: src/ipython_view.py | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diffs (16 lines): diff -r def3c9004a4a -r eced5460e91a src/ipython_view.py --- a/src/ipython_view.py Thu Dec 23 13:55:13 2010 +0100 +++ b/src/ipython_view.py Thu Dec 23 13:59:28 2010 +0100 @@ -51,6 +51,12 @@ try: import IPython + import IPython.iplib + import IPython.prefilter + import IPython.Shell + import IPython.genutils + import IPython.shadowns + import IPython.history except ImportError: IPython = None

1 0

gajim: fix duplicate function name. This fixes caps problem.
by Yann Leboulanger 23 Dec '10

23 Dec '10

changeset def3c9004a4a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=def3c9004a4a description: fix duplicate function name. This fixes caps problem. diffstat: src/common/protocol/caps.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 2b8d6a583318 -r def3c9004a4a src/common/protocol/caps.py --- a/src/common/protocol/caps.py Wed Dec 22 18:19:48 2010 +0100 +++ b/src/common/protocol/caps.py Thu Dec 23 13:55:13 2010 +0100 @@ -44,7 +44,7 @@ gajim.ged.register_event_handler('caps-presence-received', ged.GUI1, self._nec_caps_presence_received) gajim.ged.register_event_handler('agent-info-received', ged.GUI1, - self._nec_agent_info_received) + self._nec_agent_info_received_caps) def caps_change_account_name(self, new_name): self._account = new_name @@ -72,7 +72,7 @@ contact = gajim.contacts.get_gc_contact(self._account, room_jid, nick) return contact - def _nec_agent_info_received(self, obj): + def _nec_agent_info_received_caps(self, obj): """ callback to update our caps cache with queried information after we have retrieved an unknown caps hash and issued a disco

1 0

gajim: redraw groupchat group row when we receive a presence. Fi...
by Yann Leboulanger 22 Dec '10

22 Dec '10

changeset 2b8d6a583318 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b8d6a583318 description: redraw groupchat group row when we receive a presence. Fixes #5992 diffstat: src/roster_window.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 768c7a2c13fb -r 2b8d6a583318 src/roster_window.py --- a/src/roster_window.py Wed Dec 22 17:46:28 2010 +0100 +++ b/src/roster_window.py Wed Dec 22 18:19:48 2010 +0100 @@ -2501,6 +2501,7 @@ 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: remove useless indentation
by Yann Leboulanger 22 Dec '10

22 Dec '10

changeset 768c7a2c13fb in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=768c7a2c13fb description: remove useless indentation diffstat: src/roster_window.py | 53 +++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 27 deletions(-) diffs (64 lines): diff -r d54dd99bb646 -r 768c7a2c13fb src/roster_window.py --- a/src/roster_window.py Wed Dec 22 16:53:21 2010 +0100 +++ b/src/roster_window.py Wed Dec 22 17:46:28 2010 +0100 @@ -430,34 +430,33 @@ if iter_children: # We have children. We cannot be removed! return False - else: - # Remove us and empty groups from the model - for i in iters: - assert self.model[i][C_JID] == contact.jid and \ - self.model[i][C_ACCOUNT] == account, \ - "Invalidated iters of %s" % contact.jid - - parent_i = self.model.iter_parent(i) + # Remove us and empty groups from the model + for i in iters: + assert self.model[i][C_JID] == contact.jid and \ + self.model[i][C_ACCOUNT] == account, \ + "Invalidated iters of %s" % contact.jid + + parent_i = self.model.iter_parent(i) + parent_type = self.model[parent_i][C_TYPE] + + to_be_removed = i + while parent_type == 'group' and \ + self.model.iter_n_children(parent_i) == 1: + if self.regroup: + account_group = 'MERGED' + else: + account_group = account + group = self.model[parent_i][C_JID].decode('utf-8') + if group in gajim.groups[account]: + del gajim.groups[account][group] + to_be_removed = parent_i + del self._iters[account_group]['groups'][group] + parent_i = self.model.iter_parent(parent_i) parent_type = self.model[parent_i][C_TYPE] - - to_be_removed = i - while parent_type == 'group' and \ - self.model.iter_n_children(parent_i) == 1: - if self.regroup: - account_group = 'MERGED' - else: - account_group = account - group = self.model[parent_i][C_JID].decode('utf-8') - if group in gajim.groups[account]: - del gajim.groups[account][group] - to_be_removed = parent_i - del self._iters[account_group]['groups'][group] - parent_i = self.model.iter_parent(parent_i) - parent_type = self.model[parent_i][C_TYPE] - self.model.remove(to_be_removed) - - del self._iters[account]['contacts'][contact.jid] - return True + self.model.remove(to_be_removed) + + del self._iters[account]['contacts'][contact.jid] + return True def _add_metacontact_family(self, family, account): """

1 0

gajim: update groupchat Contct instance when we get a presence. ...
by Yann Leboulanger 22 Dec '10

22 Dec '10

changeset d54dd99bb646 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d54dd99bb646 description: update groupchat Contct instance when we get a presence. Fixes #5992 diffstat: src/roster_window.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r c9fb742d989b -r d54dd99bb646 src/roster_window.py --- a/src/roster_window.py Wed Dec 22 11:21:57 2010 +0100 +++ b/src/roster_window.py Wed Dec 22 16:53:21 2010 +0100 @@ -2500,6 +2500,7 @@ 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) def _nec_roster_received(self, obj):

1 0

gajim: fix var name
by Yann Leboulanger 22 Dec '10

22 Dec '10

changeset c9fb742d989b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c9fb742d989b description: fix var name diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0d2936367209 -r c9fb742d989b src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Dec 21 23:33:45 2010 +0100 +++ b/src/common/connection_handlers.py Wed Dec 22 11:21:57 2010 +0100 @@ -1737,7 +1737,7 @@ return for jid in obj.jid_list: log.debug('Removing contact %s due to unregistered transport %s' % \ - (jid, agent)) + (jid, obj.agent)) self.unsubscribe(jid) # Transport contacts can't have 2 resources if jid in gajim.to_be_removed[self.name]:

1 0

gajim: [steelman] Check sound allowance for contact_connected an...
by Yann Leboulanger 21 Dec '10

21 Dec '10

changeset 0d2936367209 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0d2936367209 description: [steelman] Check sound allowance for contact_connected and contact_disconnected events. Fixes #6118 diffstat: src/notify.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (22 lines): diff -r 25d17db44ab3 -r 0d2936367209 src/notify.py --- a/src/notify.py Tue Dec 21 22:28:03 2010 +0300 +++ b/src/notify.py Tue Dec 21 23:33:45 2010 +0100 @@ -162,14 +162,16 @@ do_popup = True if gajim.config.get_per('soundevents', 'contact_connected', 'enabled') and not gajim.block_signed_in_notifications[account] and \ - not block_transport: + not block_transport and helpers.allow_sound_notification(account, + event, advanced_notif_num): 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'): + 'enabled') and helpers.allow_sound_notification(account, + event, advanced_notif_num): do_sound = True elif event == 'new_message': message_type = parameters[0]

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2010