xserver: Move XDM dbus chats under main dbus optional.

policy/modules/services/xserver.te

@@ -1,4 +1,4 @@
-policy_module(xserver, 3.18.1)
+policy_module(xserver, 3.18.2)
 
 gen_require(`
 	class x_drawable all_x_drawable_perms;
@@ -514,14 +514,6 @@ optional_policy(`
 	alsa_domtrans(xdm_t)
 ')
 
-optional_policy(`
-	colord_dbus_chat(xdm_t)
-')
-
-optional_policy(`
-	consolekit_dbus_chat(xdm_t)
-')
-
 optional_policy(`
 	consoletype_exec(xdm_t)
 ')
@@ -537,14 +529,23 @@ optional_policy(`
 		accountsd_dbus_chat(xdm_t)
 	')
 
+	optional_policy(`
+		colord_dbus_chat(xdm_t)
+	')
+
+	optional_policy(`
+		consolekit_dbus_chat(xdm_t)
+	')
+
+	optional_policy(`
+		devicekit_dbus_chat_power(xdm_t)
+	')
+
 	optional_policy(`
 		systemd_read_logind_pids(xdm_t)
 	')
 ')
 
-optional_policy(`
-	devicekit_dbus_chat_power(xdm_t)
-')
 
 optional_policy(`
 	gnome_spec_domtrans_all_gkeyringd(xdm_t)