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

1 files changed, 15 insertions, 15 deletions

diff --git a/sugar/presence/Activity.py b/sugar/presence/Activity.py
index 2428126..a7c2f7a 100644
--- a/sugar/presence/Activity.py
+++ b/sugar/presence/Activity.py
@@ -4,13 +4,13 @@ import dbus, dbus_bindings
 class Activity(gobject.GObject):
 
 	__gsignals__ = {
-		'BuddyJoined': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+		'buddy-joined': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
 						 ([gobject.TYPE_PYOBJECT])),
-		'BuddyLeft': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
+		'buddy-left': (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]))
 	}
 
@@ -33,67 +33,67 @@ class Activity(gobject.GObject):
 		return self._object_path
 
 	def _emit_buddy_joined_signal(self, object_path):
-		self.emit('BuddyJoined', self._ps_new_object(object_path))
+		self.emit('buddy-joined', self._ps_new_object(object_path))
 		return False
 
 	def _buddy_joined_cb(self, object_path):
 		gobject.idle_add(self._emit_buddy_joined_signal, object_path)
 
 	def _emit_buddy_left_signal(self, object_path):
-		self.emit('BuddyLeft', self._ps_new_object(object_path))
+		self.emit('buddy-left', self._ps_new_object(object_path))
 		return False
 
 	def _buddy_left_cb(self, object_path):
 		gobject.idle_add(self._emit_buddy_left_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._ps_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._ps_new_object(object_path))
 		return False
 
 	def _service_disappeared_cb(self, object_path):
 		gobject.idle_add(self._emit_service_disappeared_signal, object_path)
 
-	def getId(self):
+	def get_id(self):
 		return self._activity.getId()
 
-	def getIcon(self):
+	def get_icon(self):
 		return self._buddy.getIcon()
 
-	def getServiceOfType(self, stype):
+	def get_service_of_type(self, stype):
 		try:
 			object_path = self._buddy.getServiceOfType(stype)
 		except dbus_bindings.DBusException:
 			return None
 		return self._ps_new_object(object_path)
 
-	def getServices(self):
+	def get_services(self):
 		resp = self._activity.getServices()
 		servs = []
 		for item in resp:
 			servs.append(self._ps_new_object(item))
 		return servs
 
-	def getServicesOfType(self, stype):
+	def get_services_of_type(self, stype):
 		resp = self._activity.getServicesOfType(stype)
 		servs = []
 		for item in resp:
 			servs.append(self._ps_new_object(item))
 		return servs
 
-	def getJoinedBuddies(self):
+	def get_joined_buddies(self):
 		resp = self._activity.getJoinedBuddies(stype)
 		buddies = []
 		for item in resp:
 			buddies.append(self._ps_new_object(item))
 		return buddies
 
-	def ownerHasJoined(self):
+	def owner_has_joined(self):
 		# FIXME
 		return False