More fixes, and convert python PS bindings to more glib style method names

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)

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")

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

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()