From 3f0f5761cd0b3a6b0e0f6309347619c9e8517325 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 9 Sep 2013 18:46:57 +0100 Subject: [PATCH 5/8] mcp_account_storage_get_restrictions: return the right type --- mission-control-plugins/account-storage.c | 3 +-- mission-control-plugins/account-storage.h | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/mission-control-plugins/account-storage.c b/mission-control-plugins/account-storage.c index b96b8e1..159a9f4 100644 --- a/mission-control-plugins/account-storage.c +++ b/mission-control-plugins/account-storage.c @@ -968,8 +968,7 @@ mcp_account_storage_get_additional_info (const McpAccountStorage *storage, * Returns: a bitmask of %TpStorageRestrictionFlags with the restrictions to * account storage. */ -/* FIXME: when breaking API, make this return TpStorageRestrictionFlags */ -guint +TpStorageRestrictionFlags mcp_account_storage_get_restrictions (const McpAccountStorage *storage, const gchar *account) { diff --git a/mission-control-plugins/account-storage.h b/mission-control-plugins/account-storage.h index 38c6940..e1af506 100644 --- a/mission-control-plugins/account-storage.h +++ b/mission-control-plugins/account-storage.h @@ -102,8 +102,7 @@ typedef void (*McpAccountStorageGetIdentifierFunc) ( typedef GHashTable * (*McpAccountStorageGetAdditionalInfoFunc) ( const McpAccountStorage *storage, const gchar *account); -/* FIXME: when breaking API, make this return TpStorageRestrictionFlags */ -typedef guint (*McpAccountStorageGetRestrictionsFunc) ( +typedef TpStorageRestrictionFlags (*McpAccountStorageGetRestrictionsFunc) ( const McpAccountStorage *storage, const gchar *account); @@ -195,7 +194,8 @@ GHashTable *mcp_account_storage_get_additional_info ( const McpAccountStorage *storage, const gchar *account); -guint mcp_account_storage_get_restrictions (const McpAccountStorage *storage, +TpStorageRestrictionFlags mcp_account_storage_get_restrictions ( + const McpAccountStorage *storage, const gchar *account); const gchar *mcp_account_storage_name (const McpAccountStorage *storage); -- 1.8.4.rc3