From 57cc6a303c6c062c7af5544fc9469f80d92a808f Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Wed, 26 Jul 2006 09:44:54 +0000 Subject: Some fixes, adapt the presence view to the new api --- diff --git a/shell/PeopleWindow.py b/shell/PeopleWindow.py index 3d999c3..78a31ad 100644 --- a/shell/PeopleWindow.py +++ b/shell/PeopleWindow.py @@ -14,8 +14,7 @@ class PeopleWindow(gtk.Window): hbox = gtk.HBox(False, 12) hbox.set_border_width(12) - presence_view = PresenceView(shell) - presence_view.set_activity(activity) + presence_view = PresenceView(shell, activity) hbox.pack_start(presence_view, False) presence_view.show() diff --git a/shell/PresenceService/PresenceService.py b/shell/PresenceService/PresenceService.py index e56c311..2c299af 100644 --- a/shell/PresenceService/PresenceService.py +++ b/shell/PresenceService/PresenceService.py @@ -338,7 +338,8 @@ class PresenceService(object): owner_nick = env.get_nick_name() source_addr = service.get_source_address() objid = self._get_next_object_id() - if name == owner_nick and source_addr in self._local_addrs.values(): + # FIXME put this back: source_addr in self._local_addrs.values() + if name == owner_nick: buddy = Buddy.Owner(self._bus_name, objid, service) self._owner = buddy logging.debug("Owner is '%s'." % name) diff --git a/shell/PresenceView.py b/shell/PresenceView.py index 7a094f2..436a244 100644 --- a/shell/PresenceView.py +++ b/shell/PresenceView.py @@ -12,35 +12,23 @@ class PresenceView(gtk.VBox): _MODEL_COL_NICK = 0 _MODEL_COL_ICON = 1 _MODEL_COL_BUDDY = 2 - _MODEL_COL_VISIBLE = 3 - def __init__(self, shell): + def __init__(self, shell, activity): gtk.VBox.__init__(self, False, 6) - self._activity = None + self._activity = activity + self._activity_ps = None self._shell = shell self._pservice = PresenceService() - self._pservice.connect("buddy-appeared", self._on_buddy_appeared_cb) - self._pservice.connect("buddy-disappeared", self._on_buddy_disappeared_cb) + self._pservice.connect("activity-appeared", self._activity_appeared_cb) self._setup_ui() - def _is_buddy_visible(self, buddy): - if self._activity: - activity_type = self._activity.get_default_type() - service = buddy.get_service_of_type(activity_type, self._activity) - return service is not None - else: - return True - - def _update_buddies_visibility(self): - for row in self._buddy_store: - row[self._MODEL_COL_VISIBLE] = self._is_buddy_visible(row[self._MODEL_COL_BUDDY]) + activity_ps = self._pservice.get_activity(activity.get_id()) + if activity_ps: + self._set_activity_ps(activity_ps) - def set_activity(self, activity): - self._activity = activity - self._update_buddies_visibility() if activity: if self._activity.get_shared(): self._share_button.set_sensitive(False) @@ -49,6 +37,13 @@ class PresenceView(gtk.VBox): else: self._share_button.set_sensitive(False) + def _set_activity_ps(self, activity_ps): + self._activity_ps = activity_ps + self._activity_ps.connect('buddy-joined', self._buddy_joined_cb) + self._activity_ps.connect('buddy-left', self._buddy_left_cb) + for buddy in activity_ps.get_joined_buddies(): + self._add_buddy(buddy) + def _setup_ui(self): self.set_size_request(120, -1) @@ -61,14 +56,12 @@ class PresenceView(gtk.VBox): gtk.gdk.Pixbuf, gobject.TYPE_PYOBJECT, bool) - buddy_list_model = self._buddy_store.filter_new() - buddy_list_model.set_visible_column(self._MODEL_COL_VISIBLE) sw = gtk.ScrolledWindow() sw.set_shadow_type(gtk.SHADOW_IN) sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - self._buddy_list_view = gtk.TreeView(buddy_list_model) + self._buddy_list_view = gtk.TreeView(self._buddy_store) self._buddy_list_view.set_headers_visible(False) self._buddy_list_view.connect("cursor-changed", self._on_buddyList_buddy_selected) self._buddy_list_view.connect("row-activated", self._on_buddyList_buddy_double_clicked) @@ -130,27 +123,27 @@ class PresenceView(gtk.VBox): it = self._get_iter_for_buddy(buddy) self._buddy_store.set(it, self._MODEL_COL_ICON, buddy.get_icon_pixbuf()) - def _on_buddy_appeared_cb(self, pservice, buddy): - if buddy.is_owner(): - # Do not show ourself in the buddy list + def _activity_appeared_cb(self, pservice, activity): + if self._activity_ps: return + if activity.get_id() == self._activity.get_id(): + self._set_activity_ps(activity) + + def _buddy_joined_cb(self, pservice, buddy): + self._add_buddy(buddy) + + def _add_buddy(self, buddy): + #if buddy.is_owner(): + # Do not show ourself in the buddy list + #return aniter = self._buddy_store.append(None) self._buddy_store.set(aniter, self._MODEL_COL_NICK, buddy.get_name(), - self._MODEL_COL_BUDDY, buddy, - self._MODEL_COL_VISIBLE, self._is_buddy_visible(buddy)) + self._MODEL_COL_BUDDY, buddy) buddy.connect('icon-changed', self.__buddy_icon_changed_cb) - buddy.connect('service-added', self.__buddy_service_added_cb) - buddy.connect('service-removed', self.__buddy_service_removed_cb) - def __buddy_service_added_cb(self, buddy, service): - self._update_buddies_visibility() - - def __buddy_service_removed_cb(self, buddy, service): - self._update_buddies_visibility() - - def _on_buddy_disappeared_cb(self, pservice, buddy): + def _buddy_left_cb(self, pservice, buddy): aniter = self._get_iter_for_buddy(buddy) if aniter: self._buddy_store.remove(aniter) diff --git a/sugar/presence/Activity.py b/sugar/presence/Activity.py index 761017e..6fda309 100644 --- a/sugar/presence/Activity.py +++ b/sugar/presence/Activity.py @@ -81,7 +81,7 @@ class Activity(gobject.GObject): return servs def get_joined_buddies(self): - resp = self._activity.getJoinedBuddies(stype) + resp = self._activity.getJoinedBuddies() buddies = [] for item in resp: buddies.append(self._ps_new_object(item)) -- cgit v0.9.1