diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-05-05 18:00:45 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-05-05 18:00:45 +0100 |
| commit | 7b857fe79d268b0ff8cf919c8785a5a686f3c351 (patch) | |
| tree | e91595c0568d8d65d66821dee6ba62d6f7cefc5f | |
| parent | 698dbc6a8a55d3732c7b52ef00f38c9a24c79889 (diff) | |
| download | telepathy-mission-control-7b857fe79d268b0ff8cf919c8785a5a686f3c351.tar.gz | |
AegisAcl: implement McpDispatchOperationPolicy, not McpDBusChannelAcl
| -rw-r--r-- | plugins/mcp-dbus-aegis-acl.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/plugins/mcp-dbus-aegis-acl.c b/plugins/mcp-dbus-aegis-acl.c index 86233e7e..b0dda6ce 100644 --- a/plugins/mcp-dbus-aegis-acl.c +++ b/plugins/mcp-dbus-aegis-acl.c @@ -70,7 +70,7 @@ static creds_type_t aegis_type = CREDS_BAD; static void aegis_acl_iface_init (McpDBusAclIface *, gpointer); -static void aegis_channel_acl_iface_init (McpDBusChannelAclIface *, +static void aegis_cdo_policy_iface_init (McpDispatchOperationPolicyIface *, gpointer); static GType aegis_acl_get_type (void); @@ -78,8 +78,8 @@ static GType aegis_acl_get_type (void); G_DEFINE_TYPE_WITH_CODE (AegisAcl, aegis_acl, G_TYPE_OBJECT, G_IMPLEMENT_INTERFACE (MCP_TYPE_DBUS_ACL, aegis_acl_iface_init); - G_IMPLEMENT_INTERFACE (MCP_TYPE_DBUS_CHANNEL_ACL, - aegis_channel_acl_iface_init)) + G_IMPLEMENT_INTERFACE (MCP_TYPE_DISPATCH_OPERATION_POLICY, + aegis_cdo_policy_iface_init)) static void aegis_acl_init (AegisAcl *self) @@ -304,7 +304,7 @@ cm_is_restricted (const gchar *cm_name) } static gboolean -channel_authorised (McpDBusChannelAcl *self, +handler_is_suitable (McpDispatchOperationPolicy *self, TpProxy *recipient, McpDispatchOperation *dispatch_op) { @@ -334,18 +334,16 @@ channel_authorised (McpDBusChannelAcl *self, g_object_unref (proxy); } - DEBUG ("sync Aegis Channel ACL check [%s]", ok ? "Allowed" : "Forbidden"); + DEBUG ("sync Aegis CDO policy check [%s]", ok ? "Allowed" : "Forbidden"); return ok; } static void -aegis_channel_acl_iface_init (McpDBusChannelAclIface *iface, +aegis_cdo_policy_iface_init (McpDispatchOperationPolicyIface *iface, gpointer unused G_GNUC_UNUSED) { - mcp_dbus_channel_acl_iface_set_name (iface, PLUGIN_NAME); - mcp_dbus_channel_acl_iface_set_desc (iface, PLUGIN_DESCRIPTION); - mcp_dbus_channel_acl_iface_implement_authorised (iface, channel_authorised); + iface->handler_is_suitable = handler_is_suitable; } GObject * |