telepathy: move gkeyring dbus chat call for mc to local policy as it

does not need a role prefix parameter.

diff --git a/policy/modules/apps/telepathy.if b/policy/modules/apps/telepathy.if
index d0593d934139c207170e775e856ec2abc004ce92..4a4cba62905fa7ac1283ced5e9f0403ff10414ad 100644 (file)
--- a/policy/modules/apps/telepathy.if
+++ b/policy/modules/apps/telepathy.if
@@ -84,10 +84,6 @@ template(`telepathy_role',`
        optional_policy(`
                telepathy_dbus_chat($2)
        ')
-
-       optional_policy(`
-               gnome_dbus_chat_gkeyringd($3, telepathy_mission_control_t)
-       ')
 ')
 
 ########################################

diff --git a/policy/modules/apps/telepathy.te b/policy/modules/apps/telepathy.te
index e02f44d19bfc49726161f09fbbfe0250da66288f..9f6298c67d30e2863886c5993921b50ae6ba405f 100644 (file)
--- a/policy/modules/apps/telepathy.te
+++ b/policy/modules/apps/telepathy.te
@@ -216,6 +216,10 @@ tunable_policy(`use_samba_home_dirs',`
        fs_manage_cifs_files(telepathy_mission_control_t)
 ')
 
+optional_policy(`
+       gnome_dbus_chat_gkeyringd(telepathy_mission_control_t)
+')
+
 # ~/.cache/.mc_connections.
 optional_policy(`
         manage_files_pattern(telepathy_mission_control_t, telepathy_mission_control_cache_home_t, telepathy_mission_control_cache_home_t)