diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-09-29 11:10:16 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-10-06 15:16:19 +0100 |
| commit | f03e38c057a3d38537bc585dabc78ed0dc8cda24 (patch) | |
| tree | cf626e19558338428610f23c27ceefabfc0f6fdd | |
| parent | 793cc900f08c0cc1efacc33d997c943fa1893086 (diff) | |
| download | telepathy-mission-control-f03e38c057a3d38537bc585dabc78ed0dc8cda24.tar.gz | |
fd.o #30448: make type of mcp_account_storage_get_restrictions consistent with the header
It seems we changed the implementation but not the header, and Solaris CC
is stricter about this than gcc. Since the header defines our API, it
seems better to fix this in the implementation for the moment.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30448
Reviewed-by: Vivek Dasmohapatra <vivek@collabora.co.uk>
| -rw-r--r-- | mission-control-plugins/account-storage.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mission-control-plugins/account-storage.c b/mission-control-plugins/account-storage.c index 4390937d..682c1438 100644 --- a/mission-control-plugins/account-storage.c +++ b/mission-control-plugins/account-storage.c @@ -158,7 +158,8 @@ struct _McpAccountStorageIface const McpAccountStorage *self, const gchar *account); - TpStorageRestrictionFlags (*get_restrictions) ( + /* FIXME: when breaking API, make this return TpStorageRestrictionFlags */ + guint (*get_restrictions) ( const McpAccountStorage *self, const gchar *account); }; @@ -745,10 +746,11 @@ mcp_account_storage_get_additional_info (const McpAccountStorage *storage, * @storage: an #McpAccountStorage instance * @account: the unique name of the account * - * Returns: a bitmask with the restrictions of this - * account storage. + * Returns: a bitmask of %TpStorageRestrictionFlags with the restrictions to + * account storage. */ -TpStorageRestrictionFlags +/* FIXME: when breaking API, make this return TpStorageRestrictionFlags */ +guint mcp_account_storage_get_restrictions (const McpAccountStorage *storage, const gchar *account) { |