From 64a67e28f61dae25f04b18efaedc2dad7733da93 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 16 Mar 2007 10:00:16 -0400 Subject: [PATCH 1/3] Disable sharing for trial1 --- shell/view/frame/ZoomBox.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/shell/view/frame/ZoomBox.py b/shell/view/frame/ZoomBox.py index 231f1883..ecf70e26 100644 --- a/shell/view/frame/ZoomBox.py +++ b/shell/view/frame/ZoomBox.py @@ -31,10 +31,11 @@ class ActivityMenu(Menu): def __init__(self, activity_model): Menu.__init__(self, activity_model.get_title()) - if not activity_model.get_shared(): - self.add_item(MenuItem(ActivityMenu.ACTION_SHARE, - _('Share'), - 'theme:stock-share-mesh')) +# FIXME: re-enable after trial1 +# if not activity_model.get_shared(): +# self.add_item(MenuItem(ActivityMenu.ACTION_SHARE, +# _('Share'), +# 'theme:stock-share-mesh')) self.add_item(MenuItem(ActivityMenu.ACTION_CLOSE, _('Close'), From bd2ff74be41b0da21abe45f67a16d98d272f5cbc Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 16 Mar 2007 10:12:50 -0400 Subject: [PATCH 2/3] Trivial debug message cleanups --- services/presence2/server_plugin.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/presence2/server_plugin.py b/services/presence2/server_plugin.py index 84aa10bd..8d68c3f4 100644 --- a/services/presence2/server_plugin.py +++ b/services/presence2/server_plugin.py @@ -378,6 +378,8 @@ class ServerPlugin(gobject.GObject): except dbus.DBusException, e: if str(e).startswith("org.freedesktop.DBus.Error.NoReply"): raise InvalidBuddyError("couldn't get properties") + props = {} + logging.debug("Error getting buddy properties: %s" % e) if not props.has_key('color'): raise InvalidBuddyError("no color") @@ -402,7 +404,9 @@ class ServerPlugin(gobject.GObject): online = handle in self._online_contacts for status, params in statuses.items(): jid = self._conn[CONN_INTERFACE].InspectHandles(CONNECTION_HANDLE_TYPE_CONTACT, [handle])[0] - print "Handle %s (%s) was online=%s. new statuse %s" % (handle, jid, online, status) + olstr = "ONLINE" + if not online: olstr = "OFFLINE" + print "Handle %s (%s) was %s, status now '%s'." % (handle, jid, olstr, status) if not online and status in ["available", "away", "brb", "busy", "dnd", "xa"]: try: self._contact_online(handle) From d196fb89a7567b34e1f8312ea17d654db2d3524b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 16 Mar 2007 10:43:15 -0400 Subject: [PATCH 3/3] Ignore owner property updates from the network; handled locally --- services/presence2/server_plugin.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/services/presence2/server_plugin.py b/services/presence2/server_plugin.py index 8d68c3f4..e3351941 100644 --- a/services/presence2/server_plugin.py +++ b/services/presence2/server_plugin.py @@ -416,6 +416,11 @@ class ServerPlugin(gobject.GObject): self._contact_offline(handle) def _avatar_updated_cb(self, handle, new_avatar_token): + if handle == self._conn[CONN_INTERFACE].GetSelfHandle(): + # ignore network events for Owner property changes since those + # are handled locally + return + jid = self._online_contacts[handle] icon = self._icon_cache.get_icon(jid, new_avatar_token) if not icon: @@ -432,14 +437,23 @@ class ServerPlugin(gobject.GObject): #print "Buddy %s alias changed to %s" % (handle, alias) self._buddy_properties_changed_cb(handle, prop) - def _buddy_properties_changed_cb(self, contact, properties): - self.emit("buddy-properties-changed", contact, properties) + def _buddy_properties_changed_cb(self, handle, properties): + if handle == self._conn[CONN_INTERFACE].GetSelfHandle(): + # ignore network events for Owner property changes since those + # are handled locally + return + self.emit("buddy-properties-changed", handle, properties) + + def _buddy_activities_changed_cb(self, handle, activities): + if handle == self._conn[CONN_INTERFACE].GetSelfHandle(): + # ignore network events for Owner activity changes since those + # are handled locally + return - def _buddy_activities_changed_cb(self, contact, activities): for act_id, act_handle in activities: self._activities[act_id] = act_handle activities_id = map(lambda x: x[0], activities) - self.emit("buddy-activities-changed", contact, activities_id) + self.emit("buddy-activities-changed", handle, activities_id) def _new_channel_cb(self, object_path, channel_type, handle_type, handle, suppress_handler): if handle_type == CONNECTION_HANDLE_TYPE_ROOM and channel_type == CHANNEL_TYPE_TEXT: