telepathy: fix telepathy_role, allow telepathy_mission_control_t to dbus

chat to gkeyringd.
dbus: fix xml

diff --git a/policy/modules/apps/telepathy.if b/policy/modules/apps/telepathy.if
index cfeed2983cef6a46429997576581a73b174d6b22..d0593d934139c207170e775e856ec2abc004ce92 100644 (file)
--- a/policy/modules/apps/telepathy.if
+++ b/policy/modules/apps/telepathy.if
@@ -43,9 +43,13 @@ template(`telepathy_domain_template',`
 ##     The type of the user domain.
 ##     </summary>
 ## </param>
+## <param name="domain_prefix">
+##     <summary>
+##     User domain prefix to be used.
+##     </summary>
+## </param>
 #
-template(`telepathy_role', `
-
+template(`telepathy_role',`
        gen_require(`
                attribute telepathy_domain;
                type telepathy_gabble_t, telepathy_sofiasip_t, telepathy_idle_t;
@@ -76,11 +80,15 @@ template(`telepathy_role', `
        dbus_session_domain($3, telepathy_sunshine_exec_t, telepathy_sunshine_t)
        dbus_session_domain($3, telepathy_stream_engine_exec_t, telepathy_stream_engine_t)
        dbus_session_domain($3, telepathy_msn_exec_t, telepathy_msn_t)
-')
 
-    optional_policy(`
-        telepathy_dbus_chat($2)
-    ')
+       optional_policy(`
+               telepathy_dbus_chat($2)
+       ')
+
+       optional_policy(`
+               gnome_dbus_chat_gkeyringd($3, telepathy_mission_control_t)
+       ')
+')
 
 ########################################
 ## <summary>

diff --git a/policy/modules/services/dbus.if b/policy/modules/services/dbus.if
index 5a0ca9fe6d65e918a539ef68672d1cdb1149b74d..7dbd8f661e7a41455b701421ea92fcc99e5379f8 100644 (file)
--- a/policy/modules/services/dbus.if
+++ b/policy/modules/services/dbus.if
@@ -363,6 +363,11 @@ interface(`dbus_connect_session_bus',`
 ##     Allow a application domain to be started
 ##     by the session dbus.
 ## </summary>
+## <param name="domain_prefix">
+##     <summary>
+##     User domain prefix to be used.
+##     </summary>
+## </param>
 ## <param name="domain">
 ##     <summary>
 ##     Type to be used as a domain.