Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2011-06-26 13:17:17 (GMT)
committer Simon Schampijer <simon@schampijer.de>2011-07-06 07:22:25 (GMT)
commit8691e60a7f684cb66e898bf28eddcf4dbe314949 (patch)
treeac4499cee2c71c2e85a73f81e0b2ab15e9f90487
parent0595cf12c17760d416bb6beba8ba26ed628441ed (diff)
Gabble: do not add ourself to the model twice OLPC #10965sucrose-0.92
We do add ourself to the model by default. When we are connected to the server it often gives us as well ourself back. This is due to a bug in the @online@ implementation in ejabberd. The first version to have this fixed is v2.1.7, more background info at https://support.process-one.net/browse/EJAB-1391. Signed-off-by: Simon Schampijer <simon@laptop.org> Acked-By: Sascha Silbe <silbe@activitycentral.com>
-rw-r--r--src/jarabe/model/neighborhood.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/jarabe/model/neighborhood.py b/src/jarabe/model/neighborhood.py
index 4bb9d92..5a4c5a5 100644
--- a/src/jarabe/model/neighborhood.py
+++ b/src/jarabe/model/neighborhood.py
@@ -552,6 +552,11 @@ class _Account(gobject.GObject):
for handle in attributes.keys():
nick = attributes[handle][CONNECTION_INTERFACE_ALIASING + '/alias']
+ if handle == self._self_handle:
+ logging.debug('_Account.__get_contact_attributes_cb,' \
+ ' do not add ourself %r', handle)
+ continue
+
if handle in self._buddy_handles and \
not self._buddy_handles[handle] is None:
logging.debug('Got handle %r with nick %r, going to update',