realName() method for some objects

configs/dbus/org.etersoft.settingsd.conf

@@ -56,6 +56,7 @@
 	<!-- fmod_system_services -->
 	<policy context="default">
 		<allow send_destination="org.etersoft.settingsd" send_interface="org.etersoft.settingsd.functions.systemServices" send_member="servicesChanged"/>
+		<allow send_destination="org.etersoft.settingsd" send_interface="org.etersoft.settingsd.functions.systemService" send_member="realName"/>
 		<allow send_destination="org.etersoft.settingsd" send_interface="org.etersoft.settingsd.functions.systemService" send_member="description"/>
 		<allow send_destination="org.etersoft.settingsd" send_interface="org.etersoft.settingsd.functions.systemService" send_member="shortDescription"/>
 		<allow send_destination="org.etersoft.settingsd" send_interface="org.etersoft.settingsd.functions.systemService" send_member="levelsMap"/>
@@ -66,6 +67,7 @@
 	<!-- fmod_local_groups -->
 	<policy context="default">
 		<allow send_destination="org.etersoft.settingsd" send_interface="org.etersoft.settingsd.functions.localGroups" send_member="groupsChanged"/>
+		<allow send_destination="org.etersoft.settingsd" send_interface="org.etersoft.settingsd.functions.localGroup" send_member="realName"/>
 		<allow send_destination="org.etersoft.settingsd" send_interface="org.etersoft.settingsd.functions.localGroup" send_member="gid"/>
 		<allow send_destination="org.etersoft.settingsd" send_interface="org.etersoft.settingsd.functions.localGroup" send_member="users"/>
 	</policy>

plugins/functions/fmod_local_groups.py

@@ -38,13 +38,13 @@ class LocalGroup(service.FunctionObject) :
 		self.__group_name = group_name
 
 
-	### Public ###
+	### DBus methods ###
 
-	def name(self) :
+	@service.functionMethod(LOCAL_GROUP_METHODS_NAMESPACE, out_signature="s")
+	def realName(self) :
 		return self.__group_name
 
-
-	### DBus methods ###
+	###
 
 	@service.functionMethod(LOCAL_GROUP_METHODS_NAMESPACE, in_signature="s", out_signature="i")
 	def addUser(self, user_name) :
@@ -181,7 +181,7 @@ class Service(service.Service, pyinotify.ThreadedNotifier) :
 
 		for dbus_group_name in local_groups_shared.sharedObjects().keys() :
 			if not dbus_group_name in dbus_group_names_list :
-				group_name = local_groups_shared.sharedObject(dbus_group_name).name()
+				group_name = local_groups_shared.sharedObject(dbus_group_name).realName()
 				local_groups_shared.sharedObject(dbus_group_name).removeFromConnection()
 				local_groups_shared.removeSharedObject(dbus_group_name)
 				logger.verbose("{mod}: Removed UNIX group \"%s\"" % (group_name))

plugins/functions/fmod_system_services.py

@@ -29,9 +29,6 @@ SYSTEM_SERVICE_METHODS_NAMESPACE = "systemService"
 SYSTEM_SERVICES_METHODS_NAMESPACE = "systemServices"
 
 
-RUNLEVELS = "0123456"
-
-
 ##### Private classes #####
 class SystemService(service.FunctionObject) :
 	def __init__(self, system_service_name, object_path, service_object = None) :
@@ -40,13 +37,13 @@ class SystemService(service.FunctionObject) :
 		self.__system_service_name = system_service_name
 
 
-	### Public ###
+	### DBus methods ###
 
-	def name(self) :
+	@service.functionMethod(SYSTEM_SERVICE_METHODS_NAMESPACE, out_signature="s")
+	def realName(self) :
 		return self.__system_service_name
 
-
-	### DBus methods ###
+	###
 
 	@service.functionMethod(SYSTEM_SERVICE_METHODS_NAMESPACE, in_signature="s", out_signature="i")
 	def on(self, levels = None) :
@@ -119,7 +116,7 @@ class SystemService(service.FunctionObject) :
 			if len(levels) == 0 :
 				levels = None
 			for level in levels :
-				if not level in RUNLEVELS :
+				if not level in "0123456" :
 					raise validators.ValidatorError("Incorrect item \"%s\" in argument \"%s\"" % (level, levels))
 		elif type (levels).__name__ == "NoneType" :
 			pass