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 /shell | |
| parent | 1d0b4e12b8f6a0ddc7df0c80fe34796d127f80c5 (diff) | |
More fixes, and convert python PS bindings to more glib style method names
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ActivitiesModel.py | 2 | ||||
| -rw-r--r-- | shell/Owner.py | 2 | ||||
| -rw-r--r-- | shell/PresenceService/PresenceService.py | 11 | ||||
| -rw-r--r-- | shell/PresenceView.py | 4 |
4 files changed, 15 insertions, 4 deletions
diff --git a/shell/ActivitiesModel.py b/shell/ActivitiesModel.py index 72d4ba5..078e0d3 100644 --- a/shell/ActivitiesModel.py +++ b/shell/ActivitiesModel.py @@ -36,7 +36,7 @@ class ActivitiesModel(gobject.GObject): self._activities = [] self._pservice = PresenceService() - self._pservice.connect("ActivityAppeared", self._on_activity_announced_cb) + self._pservice.connect("activity-appeared", self._on_activity_announced_cb) def add_activity(self, service): activity_info = ActivityInfo(service) diff --git a/shell/Owner.py b/shell/Owner.py index 652f851..450fba8 100644 --- a/shell/Owner.py +++ b/shell/Owner.py @@ -32,7 +32,7 @@ class ShellOwner(object): # Create and announce our presence self._pservice = PresenceService.PresenceService() - self._service = self._pservice.registerService(nick, PRESENCE_SERVICE_TYPE) + self._service = self._pservice.register_service(nick, PRESENCE_SERVICE_TYPE) print "Owner '%s' using port %d" % (nick, self._service.get_port()) self._icon_stream = Stream.Stream.new_from_service(self._service) self._icon_stream.register_reader_handler(self._handle_buddy_icon_request, "get_buddy_icon") diff --git a/shell/PresenceService/PresenceService.py b/shell/PresenceService/PresenceService.py index 9df9077..04a4b63 100644 --- a/shell/PresenceService/PresenceService.py +++ b/shell/PresenceService/PresenceService.py @@ -182,6 +182,17 @@ class PresenceServiceDBusHelper(dbus.service.Object): port, domain) return service.object_path() + @dbus.service.method(_PRESENCE_DBUS_INTERFACE, + in_signature="s", out_signature="") + def registerServiceType(self, stype): + self._parent.register_service_type(stype) + + @dbus.service.method(_PRESENCE_DBUS_INTERFACE, + in_signature="s", out_signature="") + def unregisterServiceType(self, stype): + self._parent.unregister_service_type(stype) + + class PresenceService(object): def __init__(self): # interface -> IP address: interfaces we've gotten events on so far diff --git a/shell/PresenceView.py b/shell/PresenceView.py index fafd577..4b471bc 100644 --- a/shell/PresenceView.py +++ b/shell/PresenceView.py @@ -21,8 +21,8 @@ class PresenceView(gtk.VBox): self._shell = shell self._pservice = PresenceService() - self._pservice.connect("BuddyAppeared", self._on_buddy_appeared_cb) - self._pservice.connect("BuddyDisappeared", self._on_buddy_disappeared_cb) + self._pservice.connect("buddy-appeared", self._on_buddy_appeared_cb) + self._pservice.connect("buddy-disappeared", self._on_buddy_disappeared_cb) self._setup_ui() |