Commits December 2009

commits@gajim.org

8 participants
127 discussions

gajim: Remove some crap which should have never been commited.
by Stephan Erb 28 Dec '09

28 Dec '09

changeset 7291d2dff27e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7291d2dff27e description: Remove some crap which should have never been commited. diffstat: launch.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (8 lines): diff -r a1edfd74d825 -r 7291d2dff27e launch.sh --- a/launch.sh Mon Dec 28 21:29:51 2009 +0100 +++ b/launch.sh Mon Dec 28 21:52:45 2009 +0100 @@ -1,3 +1,3 @@ #!/bin/sh cd "$(dirname $0)/src" -exec python -m cProfile gajim.py "$@" +exec python -OOt gajim.py "$@"

1 0

gajim: Correctly fake NullClientCaps: Assume we support everythi...
by Stephan Erb 28 Dec '09

28 Dec '09

changeset a1edfd74d825 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a1edfd74d825 description: Correctly fake NullClientCaps: Assume we support everything instead of the blacklisted features. diffstat: src/common/caps_cache.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diffs (38 lines): diff -r aec976f0a6b7 -r a1edfd74d825 src/common/caps_cache.py --- a/src/common/caps_cache.py Mon Dec 28 20:58:34 2009 +0100 +++ b/src/common/caps_cache.py Mon Dec 28 21:29:51 2009 +0100 @@ -47,6 +47,7 @@ NEW = 0 QUERIED = 1 CACHED = 2 # got the answer +FAKED = 3 # allow NullClientCaps to behave as it has a cached item ################################################################################ ### Public API of this module @@ -67,7 +68,7 @@ supported_features = cache_item.features if requested_feature in supported_features: return True - elif supported_features == [] and cache_item.status in (NEW, QUERIED): + elif not supported_features and cache_item.status in (NEW, QUERIED, FAKED): # assume feature is supported, if we don't know yet, what the client # is capable of return requested_feature not in FEATURE_BLACKLIST @@ -262,7 +263,7 @@ # lookup something which does not exist to get a new CacheItem created cache_item = caps_cache[('dummy', '')] # Mark the item as cached so that protocol/caps.py does not update it - cache_item.status = CACHED + cache_item.status = FAKED return cache_item def _discover(self, connection, jid): @@ -354,7 +355,7 @@ Returns True if identities and features for this cache item are known. """ - return self.status == CACHED + return self.status in (CACHED, FAKED) self.__CacheItem = CacheItem self.logger = logger

1 0

gajim: Make NullClientCaps a singleto so that we don't create a ...
by Stephan Erb 28 Dec '09

28 Dec '09

changeset aec976f0a6b7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aec976f0a6b7 description: Make NullClientCaps a singleto so that we don't create a new object for each contact. diffstat: launch.sh | 2 +- src/common/caps_cache.py | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diffs (28 lines): diff -r cacc47928bb3 -r aec976f0a6b7 launch.sh --- a/launch.sh Mon Dec 28 20:14:15 2009 +0100 +++ b/launch.sh Mon Dec 28 20:58:34 2009 +0100 @@ -1,3 +1,3 @@ #!/bin/sh cd "$(dirname $0)/src" -exec python -OOt gajim.py "$@" +exec python -m cProfile gajim.py "$@" diff -r cacc47928bb3 -r aec976f0a6b7 src/common/caps_cache.py --- a/src/common/caps_cache.py Mon Dec 28 20:14:15 2009 +0100 +++ b/src/common/caps_cache.py Mon Dec 28 20:58:34 2009 +0100 @@ -245,6 +245,16 @@ Assumes (almost) everything is supported. """ + _instance = None + def __new__(cls, *args, **kwargs): + """ + Make it a singleton. + """ + if not cls._instance: + cls._instance = super(NullClientCaps, cls).__new__( + cls, *args, **kwargs) + return cls._instance + def __init__(self): AbstractClientCaps.__init__(self, None, None)

1 0

gajim: Slightly faster version of get_contact_iter and get_role_...
by Stephan Erb 28 Dec '09

28 Dec '09

changeset cacc47928bb3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cacc47928bb3 description: Slightly faster version of get_contact_iter and get_role_iter. diffstat: src/groupchat_control.py | 33 ++++++++++----------------------- src/roster_window.py | 6 +++--- 2 files changed, 13 insertions(+), 26 deletions(-) diffs (93 lines): diff -r c53868b8a4e3 -r cacc47928bb3 src/groupchat_control.py --- a/src/groupchat_control.py Mon Dec 28 16:32:58 2009 +0100 +++ b/src/groupchat_control.py Mon Dec 28 20:14:15 2009 +0100 @@ -122,6 +122,7 @@ renderer.set_property('font', gtkgui_helpers.get_theme_font_for_option(theme, 'groupfont')) + class PrivateChatControl(ChatControl): TYPE_ID = message_control.TYPE_PM @@ -829,24 +830,15 @@ def get_contact_iter(self, nick): model = self.list_treeview.get_model() - fin = False role_iter = model.get_iter_root() - if not role_iter: - return None - while not fin: - fin2 = False + while role_iter: user_iter = model.iter_children(role_iter) - if not user_iter: - fin2 = True - while not fin2: + while user_iter: if nick == model[user_iter][C_NICK].decode('utf-8'): return user_iter - user_iter = model.iter_next(user_iter) - if not user_iter: - fin2 = True + else: + user_iter = model.iter_next(user_iter) role_iter = model.iter_next(role_iter) - if not role_iter: - fin = True return None def print_old_conversation(self, text, contact='', tim=None, xhtml = None): @@ -1528,17 +1520,12 @@ def get_role_iter(self, role): model = self.list_treeview.get_model() - fin = False - iter_ = model.get_iter_root() - if not iter_: - return None - while not fin: - role_name = model[iter_][C_NICK].decode('utf-8') + role_iter = model.get_iter_root() + while role_iter: + role_name = model[role_iter][C_NICK].decode('utf-8') if role == role_name: - return iter_ - iter_ = model.iter_next(iter_) - if not iter_: - fin = True + return role_iter + role_iter = model.iter_next(role_iter) return None def remove_contact(self, nick): diff -r c53868b8a4e3 -r cacc47928bb3 src/roster_window.py --- a/src/roster_window.py Mon Dec 28 16:32:58 2009 +0100 +++ b/src/roster_window.py Mon Dec 28 20:14:15 2009 +0100 @@ -312,7 +312,6 @@ self.tree.freeze_child_notify() for jid in jids: self.add_contact(jid, account) - self.tree.thaw_child_notify() # Do not freeze the GUI when drawing the contacts if jids: @@ -323,6 +322,8 @@ for group in gajim.groups[account]: self.draw_group(group, account) self.draw_account(account) + + self.tree.thaw_child_notify() self.starting = False @@ -1291,8 +1292,7 @@ iters = self._get_contact_iter(jid, account, model=self.model) if not iters: return - jid = self.model[iters[0]][C_JID] - jid = jid.decode('utf-8') + jid = self.model[iters[0]][C_JID].decode('utf-8') contact = gajim.contacts.get_contact(account, jid) if pep_type in contact.pep: pixbuf = contact.pep[pep_type].asPixbufIcon()

1 0

gajim: Extract a few methods to make some code a tiny bit easier...
by Stephan Erb 28 Dec '09

28 Dec '09

changeset c53868b8a4e3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c53868b8a4e3 description: Extract a few methods to make some code a tiny bit easier to understand and read. diffstat: src/roster_window.py | 166 ++++++++++++++++++-------------------------------- 1 files changed, 59 insertions(+), 107 deletions(-) diffs (270 lines): diff -r 95cf8ae53c36 -r c53868b8a4e3 src/roster_window.py --- a/src/roster_window.py Mon Dec 28 13:27:05 2009 +0100 +++ b/src/roster_window.py Mon Dec 28 16:32:58 2009 +0100 @@ -4440,21 +4440,12 @@ """ When a row is added, set properties for icon renderer """ - theme = gajim.config.get('roster_theme') type_ = model[titer][C_TYPE] if type_ == 'account': - color = gajim.config.get_per('themes', theme, 'accountbgcolor') - if color: - renderer.set_property('cell-background', color) - else: - self.set_renderer_color(renderer, gtk.STATE_ACTIVE) + self._set_account_row_background_color(renderer) renderer.set_property('xalign', 0) elif type_ == 'group': - color = gajim.config.get_per('themes', theme, 'groupbgcolor') - if color: - renderer.set_property('cell-background', color) - else: - self.set_renderer_color(renderer, gtk.STATE_PRELIGHT) + self._set_group_row_background_color(renderer) renderer.set_property('xalign', 0.2) elif type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534 if not model[titer][C_JID] or not model[titer][C_ACCOUNT]: @@ -4462,18 +4453,7 @@ return jid = model[titer][C_JID].decode('utf-8') account = model[titer][C_ACCOUNT].decode('utf-8') - if jid in gajim.newly_added[account]: - renderer.set_property('cell-background', gajim.config.get( - 'just_connected_bg_color')) - elif jid in gajim.to_be_removed[account]: - renderer.set_property('cell-background', gajim.config.get( - 'just_disconnected_bg_color')) - else: - color = gajim.config.get_per('themes', theme, 'contactbgcolor') - if color: - renderer.set_property('cell-background', color) - else: - renderer.set_property('cell-background', None) + self._set_contact_row_background_color(renderer, jid, account) parent_iter = model.iter_parent(titer) if model[parent_iter][C_TYPE] == 'contact': renderer.set_property('xalign', 1) @@ -4493,29 +4473,21 @@ renderer.set_property('foreground', color) else: self.set_renderer_color(renderer, gtk.STATE_ACTIVE, False) - color = gajim.config.get_per('themes', theme, 'accountbgcolor') - if color: - renderer.set_property('cell-background', color) - else: - self.set_renderer_color(renderer, gtk.STATE_ACTIVE) renderer.set_property('font', gtkgui_helpers.get_theme_font_for_option(theme, 'accountfont')) renderer.set_property('xpad', 0) renderer.set_property('width', 3) + self._set_account_row_background_color(renderer) elif type_ == 'group': color = gajim.config.get_per('themes', theme, 'grouptextcolor') if color: renderer.set_property('foreground', color) else: self.set_renderer_color(renderer, gtk.STATE_PRELIGHT, False) - color = gajim.config.get_per('themes', theme, 'groupbgcolor') - if color: - renderer.set_property('cell-background', color) - else: - self.set_renderer_color(renderer, gtk.STATE_PRELIGHT) renderer.set_property('font', gtkgui_helpers.get_theme_font_for_option(theme, 'groupfont')) renderer.set_property('xpad', 4) + self._set_group_row_background_color(renderer) elif type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534 if not model[titer][C_JID] or not model[titer][C_ACCOUNT]: # This can append when at the moment we add the row @@ -4535,18 +4507,7 @@ renderer.set_property('foreground', color) else: renderer.set_property('foreground', None) - if jid in gajim.newly_added[account]: - renderer.set_property('cell-background', gajim.config.get( - 'just_connected_bg_color')) - elif jid in gajim.to_be_removed[account]: - renderer.set_property('cell-background', gajim.config.get( - 'just_disconnected_bg_color')) - else: - color = gajim.config.get_per('themes', theme, 'contactbgcolor') - if color: - renderer.set_property('cell-background', color) - else: - renderer.set_property('cell-background', None) + self._set_contact_row_background_color(renderer, jid, account) renderer.set_property('font', gtkgui_helpers.get_theme_font_for_option(theme, 'contactfont')) parent_iter = model.iter_parent(titer) @@ -4555,7 +4516,6 @@ else: renderer.set_property('xpad', 8) - def _fill_pep_pixbuf_renderer(self, column, renderer, model, titer, data=None): """ @@ -4563,48 +4523,29 @@ """ theme = gajim.config.get('roster_theme') type_ = model[titer][C_TYPE] - if type_ == 'group': + + # allocate space for the icon only if needed + if not model[titer][data]: renderer.set_property('visible', False) - return - - # allocate space for the icon only if needed - if model[titer][data]: + else: renderer.set_property('visible', True) - else: - renderer.set_property('visible', False) - if type_ == 'account': - color = gajim.config.get_per('themes', theme, 'accountbgcolor') - if color: - renderer.set_property('cell-background', color) - else: + + if type_ == 'account': self.set_renderer_color(renderer, gtk.STATE_ACTIVE) - # align pixbuf to the right) - renderer.set_property('xalign', 1) - # prevent type_ = None, see http://trac.gajim.org/ticket/2534 - elif type_: - if not model[titer][C_JID] or not model[titer][C_ACCOUNT]: - # This can append at the moment we add the row - return - jid = model[titer][C_JID].decode('utf-8') - account = model[titer][C_ACCOUNT].decode('utf-8') - if jid in gajim.newly_added[account]: - renderer.set_property('cell-background', gajim.config.get( - 'just_connected_bg_color')) - elif jid in gajim.to_be_removed[account]: - renderer.set_property('cell-background', gajim.config.get( - 'just_disconnected_bg_color')) - else: - color = gajim.config.get_per('themes', theme, 'contactbgcolor') - renderer.set_property('cell-background', color if color else None) - # align pixbuf to the right - renderer.set_property('xalign', 1) + renderer.set_property('xalign', 1) + elif type_: + if not model[titer][C_JID] or not model[titer][C_ACCOUNT]: + # This can append at the moment we add the row + return + jid = model[titer][C_JID].decode('utf-8') + account = model[titer][C_ACCOUNT].decode('utf-8') + self._set_contact_row_background_color(renderer, jid, account) def _fill_avatar_pixbuf_renderer(self, column, renderer, model, titer, data = None): """ When a row is added, set properties for avatar renderer """ - theme = gajim.config.get('roster_theme') type_ = model[titer][C_TYPE] if type_ in ('group', 'account'): renderer.set_property('visible', False) @@ -4614,51 +4555,63 @@ if model[titer][C_AVATAR_PIXBUF] or \ gajim.config.get('avatar_position_in_roster') == 'left': renderer.set_property('visible', True) + if type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534 + if not model[titer][C_JID] or not model[titer][C_ACCOUNT]: + # This can append at the moment we add the row + return + jid = model[titer][C_JID].decode('utf-8') + account = model[titer][C_ACCOUNT].decode('utf-8') + self._set_contact_row_background_color(renderer, jid, account) else: renderer.set_property('visible', False) - if type_: # prevent type_ = None, see http://trac.gajim.org/ticket/2534 - if not model[titer][C_JID] or not model[titer][C_ACCOUNT]: - # This can append at the moment we add the row - return - jid = model[titer][C_JID].decode('utf-8') - account = model[titer][C_ACCOUNT].decode('utf-8') - if jid in gajim.newly_added[account]: - renderer.set_property('cell-background', gajim.config.get( - 'just_connected_bg_color')) - elif jid in gajim.to_be_removed[account]: - renderer.set_property('cell-background', gajim.config.get( - 'just_disconnected_bg_color')) - else: - color = gajim.config.get_per('themes', theme, 'contactbgcolor') - if color: - renderer.set_property('cell-background', color) - else: - renderer.set_property('cell-background', None) + if gajim.config.get('avatar_position_in_roster') == 'left': renderer.set_property('width', gajim.config.get('roster_avatar_width')) renderer.set_property('xalign', 0.5) else: renderer.set_property('xalign', 1) # align pixbuf to the right - def _fill_padlock_pixbuf_renderer(self, column, renderer, model, titer, data - = None): + def _fill_padlock_pixbuf_renderer(self, column, renderer, model, titer, data=None): """ When a row is added, set properties for padlock renderer """ - theme = gajim.config.get('roster_theme') type_ = model[titer][C_TYPE] # allocate space for the icon only if needed if type_ == 'account' and model[titer][C_PADLOCK_PIXBUF]: renderer.set_property('visible', True) - color = gajim.config.get_per('themes', theme, 'accountbgcolor') - if color: - renderer.set_property('cell-background', color) - else: - self.set_renderer_color(renderer, gtk.STATE_ACTIVE) + self._set_account_row_background_color(renderer) renderer.set_property('xalign', 1) # align pixbuf to the right else: renderer.set_property('visible', False) + def _set_account_row_background_color(self, renderer): + theme = gajim.config.get('roster_theme') + color = gajim.config.get_per('themes', theme, 'accountbgcolor') + if color: + renderer.set_property('cell-background', color) + else: + self.set_renderer_color(renderer, gtk.STATE_ACTIVE) + + def _set_contact_row_background_color(self, renderer, jid, account): + theme = gajim.config.get('roster_theme') + if jid in gajim.newly_added[account]: + renderer.set_property('cell-background', gajim.config.get( + 'just_connected_bg_color')) + elif jid in gajim.to_be_removed[account]: + renderer.set_property('cell-background', gajim.config.get( + 'just_disconnected_bg_color')) + else: + color = gajim.config.get_per('themes', theme, 'contactbgcolor') + renderer.set_property('cell-background', color if color else None) + + def _set_group_row_background_color(self, renderer): + theme = gajim.config.get('roster_theme') + color = gajim.config.get_per('themes', theme, 'groupbgcolor') + if color: + renderer.set_property('cell-background', color) + else: + self.set_renderer_color(renderer, gtk.STATE_PRELIGHT) + ################################################################################ ### Everything about building menus ### FIXME: We really need to make it simpler! 1465 lines are a few to much.... @@ -5891,8 +5844,7 @@ def add_avatar_renderer(): render_pixbuf = gtk.CellRendererPixbuf() # avatar img col.pack_start(render_pixbuf, expand=False) - col.add_attribute(render_pixbuf, 'pixbuf', - C_AVATAR_PIXBUF) + col.add_attribute(render_pixbuf, 'pixbuf', C_AVATAR_PIXBUF) col.set_cell_data_func(render_pixbuf, self._fill_avatar_pixbuf_renderer, None)

1 0

gajim: Add missing Vim config line to gui_interface.py
by Stephan Erb 28 Dec '09

28 Dec '09

changeset 95cf8ae53c36 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=95cf8ae53c36 description: Add missing Vim config line to gui_interface.py diffstat: src/gui_interface.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (9 lines): diff -r cae1b438f025 -r 95cf8ae53c36 src/gui_interface.py --- a/src/gui_interface.py Sun Dec 27 17:50:06 2009 +0100 +++ b/src/gui_interface.py Mon Dec 28 13:27:05 2009 +0100 @@ -3495,3 +3495,5 @@ Thread(target=thread_function, args=(func, func_args, callback, callback_args)).start() + +# vim: se ts=3:

1 0

gajim: Only perform the longish check for latex support if the u...
by Stephan Erb 28 Dec '09

28 Dec '09

changeset cae1b438f025 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cae1b438f025 description: Only perform the longish check for latex support if the user has enabled latex in ACE. diffstat: src/common/gajim.py | 2 +- src/features_window.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r a7bc4afde6a1 -r cae1b438f025 src/common/gajim.py --- a/src/common/gajim.py Sun Dec 27 17:40:10 2009 +0100 +++ b/src/common/gajim.py Sun Dec 27 17:50:06 2009 +0100 @@ -183,7 +183,7 @@ HAVE_GPG = False import latex -HAVE_LATEX = latex.check_for_latex_support() +HAVE_LATEX = config.get('use_latex') and latex.check_for_latex_support() HAVE_INDICATOR = True try: diff -r a7bc4afde6a1 -r cae1b438f025 src/features_window.py --- a/src/features_window.py Sun Dec 27 17:40:10 2009 +0100 +++ b/src/features_window.py Sun Dec 27 17:50:06 2009 +0100 @@ -243,7 +243,8 @@ return sleepy.SUPPORTED def latex_available(self): - return gajim.HAVE_LATEX + from common import latex + return latex.check_for_latex_support() def pycrypto_available(self): return gajim.HAVE_PYCRYPTO

1 0

gajim: Remove unused import.
by Stephan Erb 28 Dec '09

28 Dec '09

changeset a7bc4afde6a1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a7bc4afde6a1 description: Remove unused import. diffstat: src/dialogs.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r 775b0b18efb1 -r a7bc4afde6a1 src/dialogs.py --- a/src/dialogs.py Sun Dec 27 16:50:43 2009 +0100 +++ b/src/dialogs.py Sun Dec 27 17:40:10 2009 +0100 @@ -32,7 +32,6 @@ import gtk import gobject import os -from weakref import WeakValueDictionary import gtkgui_helpers import vcard

1 0

gajim: Create index on the logs table on time instead of on kind.
by Stephan Erb 27 Dec '09

27 Dec '09

changeset 775b0b18efb1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=775b0b18efb1 description: Create index on the logs table on time instead of on kind. That way we can search through all logs in constant time instead of having to perform a full table scan. diffstat: src/common/check_paths.py | 2 +- src/common/defs.py | 2 +- src/common/optparser.py | 23 +++++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diffs (62 lines): diff -r 9bc4f60a4a17 -r 775b0b18efb1 src/common/check_paths.py --- a/src/common/check_paths.py Sun Dec 27 16:23:31 2009 +0100 +++ b/src/common/check_paths.py Sun Dec 27 16:50:43 2009 +0100 @@ -79,7 +79,7 @@ subject TEXT ); - CREATE INDEX idx_logs_jid_id_kind ON logs (jid_id, kind); + CREATE INDEX idx_logs_jid_id_time ON logs (jid_id, time DESC); CREATE TABLE caps_cache ( hash_method TEXT, diff -r 9bc4f60a4a17 -r 775b0b18efb1 src/common/defs.py --- a/src/common/defs.py Sun Dec 27 16:23:31 2009 +0100 +++ b/src/common/defs.py Sun Dec 27 16:50:43 2009 +0100 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.13.10.0-dev' +version = '0.13.10.1-dev' import sys, os.path for base in ('.', 'common'): diff -r 9bc4f60a4a17 -r 775b0b18efb1 src/common/optparser.py --- a/src/common/optparser.py Sun Dec 27 16:23:31 2009 +0100 +++ b/src/common/optparser.py Sun Dec 27 16:50:43 2009 +0100 @@ -214,6 +214,8 @@ self.update_config_to_01258() if old < [0, 13, 10, 0] and new >= [0, 13, 10, 0]: self.update_config_to_013100() + if old < [0, 13, 10, 1] and new >= [0, 13, 10, 1]: + self.update_config_to_013101() gajim.logger.init_vars() gajim.config.set('version', new_version) @@ -857,4 +859,25 @@ con.close() gajim.config.set('version', '0.13.10.0') + def update_config_to_013101(self): + back = os.getcwd() + os.chdir(logger.LOG_DB_FOLDER) + con = sqlite.connect(logger.LOG_DB_FILE) + os.chdir(back) + cur = con.cursor() + try: + cur.executescript( + ''' + DROP INDEX IF EXISTS idx_logs_jid_id_kind; + + CREATE INDEX IF NOT EXISTS + idx_logs_jid_id_time ON logs (jid_id, time DESC); + ''' + ) + con.commit() + except sqlite.OperationalError: + pass + con.close() + gajim.config.set('version', '0.13.10.1') + # vim: se ts=3:

1 0

gajim: Show warning if calculated and received caps hash are dif...
by Stephan Erb 27 Dec '09

27 Dec '09

changeset 9bc4f60a4a17 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9bc4f60a4a17 description: Show warning if calculated and received caps hash are different. diffstat: src/common/caps_cache.py | 5 +++-- src/common/protocol/caps.py | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diffs (43 lines): diff -r f6c4bf3a5767 -r 9bc4f60a4a17 src/common/caps_cache.py --- a/src/common/caps_cache.py Tue Dec 22 21:31:11 2009 +0200 +++ b/src/common/caps_cache.py Sun Dec 27 16:23:31 2009 +0100 @@ -251,7 +251,8 @@ def _lookup_in_cache(self, caps_cache): # lookup something which does not exist to get a new CacheItem created cache_item = caps_cache[('dummy', '')] - assert cache_item.status != CACHED + # Mark the item as cached so that protocol/caps.py does not update it + cache_item.status = CACHED return cache_item def _discover(self, connection, jid): @@ -390,4 +391,4 @@ else: q.update_last_seen() -# vim: se ts=3: \ No newline at end of file +# vim: se ts=3: diff -r f6c4bf3a5767 -r 9bc4f60a4a17 src/common/protocol/caps.py --- a/src/common/protocol/caps.py Tue Dec 22 21:31:11 2009 +0200 +++ b/src/common/protocol/caps.py Sun Dec 27 16:23:31 2009 +0100 @@ -90,6 +90,8 @@ cache_item = lookup(self._capscache) if cache_item.is_valid(): + # we already know that the hash is fine and have already cached + # the identities and features return else: validate = contact.client_caps.get_hash_validation_strategy() @@ -101,8 +103,9 @@ node = caps_hash = hash_method = None contact.client_caps = self._create_suitable_client_caps(node, caps_hash, hash_method) + log.warn("Computed and retrieved caps hash differ." + + "Ignoring caps of contact %s" % contact.get_full_jid()) self._dispatch_event('CAPS_RECEIVED', (jid,)) - # vim: se ts=3:

1 0

← Newer
1
2
3
4
5
6
7
...
13
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2009