diff options
author | Dan Williams <dcbw@localhost.localdomain> | 2006-07-23 14:21:00 (GMT) |
---|---|---|
committer | Dan Williams <dcbw@localhost.localdomain> | 2006-07-23 14:21:00 (GMT) |
commit | 7c996b00114c1cdc6579af57a7da63639b5fe1d5 (patch) | |
tree | 340367b4a5f38ccc2db853a1e5996fad0851ba27 /sugar/presence/PresenceService.py | |
parent | 1d0b4e12b8f6a0ddc7df0c80fe34796d127f80c5 (diff) |
More fixes, and convert python PS bindings to more glib style method names
Diffstat (limited to 'sugar/presence/PresenceService.py')
-rw-r--r-- | sugar/presence/PresenceService.py | 53 |
1 files changed, 31 insertions, 22 deletions
diff --git a/sugar/presence/PresenceService.py b/sugar/presence/PresenceService.py index 5626a7c..cfbaed9 100644 --- a/sugar/presence/PresenceService.py +++ b/sugar/presence/PresenceService.py @@ -24,17 +24,17 @@ class ObjectCache(object): class PresenceService(gobject.GObject): __gsignals__ = { - 'BuddyAppeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, + 'buddy-appeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])), - 'BuddyDisappeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, + 'buddy-disappeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])), - 'ServiceAppeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, + 'service-appeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])), - 'ServiceDisappeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, + 'service-disappeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])), - 'ActivityAppeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, + 'activity-appeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])), - 'ActivityDisappeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, + 'activity-disappeared': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])) } @@ -54,6 +54,10 @@ class PresenceService(gobject.GObject): self._PRESENCE_OBJECT_PATH), self._PRESENCE_DBUS_INTERFACE) self._ps.connect_to_signal('BuddyAppeared', self._buddy_appeared_cb) self._ps.connect_to_signal('BuddyDisappeared', self._buddy_disappeared_cb) + self._ps.connect_to_signal('ServiceAppeared', self._service_appeared_cb) + self._ps.connect_to_signal('ServiceDisappeared', self._service_disappeared_cb) + self._ps.connect_to_signal('ActivityAppeared', self._activity_appeared_cb) + self._ps.connect_to_signal('ActivityDisappeared', self._activity_disappeared_cb) def _new_object(self, object_path): obj = self._objcache.get(object_path) @@ -77,104 +81,109 @@ class PresenceService(gobject.GObject): pass def _emit_buddy_appeared_signal(self, object_path): - self.emit('BuddyAppeared', self._new_object(object_path)) + self.emit('buddy-appeared', self._new_object(object_path)) return False def _buddy_appeared_cb(self, op): gobject.idle_add(self._emit_buddy_appeared_signal, op) def _emit_buddy_disappeared_signal(self, object_path): - self.emit('BuddyDisappeared', self._ps_new_object(object_path)) + self.emit('buddy-disappeared', self._new_object(object_path)) return False def _buddy_disappeared_cb(self, object_path): gobject.idle_add(self._emit_buddy_disappeared_signal, object_path) def _emit_service_appeared_signal(self, object_path): - self.emit('ServiceAppeared', self._ps_new_object(object_path)) + self.emit('service-appeared', self._new_object(object_path)) return False def _service_appeared_cb(self, object_path): gobject.idle_add(self._emit_service_appeared_signal, object_path) def _emit_service_disappeared_signal(self, object_path): - self.emit('ServiceDisappeared', self._ps_new_object(object_path)) + self.emit('service-disappeared', self._new_object(object_path)) return False def _service_disappeared_cb(self, object_path): gobject.idle_add(self._emit_service_disappeared_signal, object_path) def _emit_activity_appeared_signal(self, object_path): - self.emit('ActivityAppeared', self._ps_new_object(object_path)) + self.emit('activity-appeared', self._new_object(object_path)) return False def _activity_appeared_cb(self, object_path): gobject.idle_add(self._emit_activity_appeared_signal, object_path) def _emit_activity_disappeared_signal(self, object_path): - self.emit('ActivityDisappeared', self._ps_new_object(object_path)) + self.emit('activity-disappeared', self._new_object(object_path)) return False def _activity_disappeared_cb(self, object_path): gobject.idle_add(self._emit_activity_disappeared_signal, object_path) - def getServices(self): + def get_services(self): resp = self._ps.getServices() servs = [] for item in resp: servs.append(self._new_object(item)) return servs - def getServicesOfType(self, stype): + def get_services_of_type(self, stype): resp = self._ps.getServicesOfType(stype) servs = [] for item in resp: servs.append(self._new_object(item)) return servs - def getActivities(self): + def get_activities(self): resp = self._ps.getActivities() acts = [] for item in resp: acts.append(self._new_object(item)) return acts - def getActivity(self, activity_id): + def get_activity(self, activity_id): try: act_op = self._ps.getActivity(activity_id) except dbus_bindings.DBusException: return None return self._new_object(act_op) - def getBuddies(self): + def get_buddies(self): resp = self._ps.getBuddies() buddies = [] for item in resp: buddies.append(self._new_object(item)) return buddies - def getBuddyByName(self, name): + def get_buddy_by_name(self, name): try: buddy_op = self._ps.getBuddyByName(name) except dbus_bindings.DBusException: return None return self._new_object(buddy_op) - def getBuddyByAddress(self, addr): + def get_buddy_by_address(self, addr): try: buddy_op = self._ps.getBuddyByAddress(addr) except dbus_bindings.DBusException: return None return self._new_object(buddy_op) - def getOwner(self): + def get_owner(self): try: owner_op = self._ps.getOwner() except dbus_bindings.DBusException: return None - return self._new_object(buddy_op) + return self._new_object(owner_op) - def registerService(self, name, stype, properties={"":""}, address="", port=-1, domain=u"local"): + def register_service(self, name, stype, properties={"":""}, address="", port=-1, domain=u"local"): serv_op = self._ps.registerService(name, stype, properties, address, port, domain) return self._new_object(serv_op) + def register_service_type(self, stype): + self._ps.registerServiceType(stype) + + def unregister_service_type(self, stype): + self._ps.unregisterServiceType(stype) |