[Pkg-telepathy-commits] [telepathy-mission-control-6] 06/280: mcp_account_storage_get_restrictions: return the right type

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 2acd03403db7b37161be84c1fe20a3237c6dce1f
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Sep 9 18:46:57 2013 +0100

    mcp_account_storage_get_restrictions: return the right type
    
    https://bugs.freedesktop.org/show_bug.cgi?id=69176
    Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
---
 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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git