From d70451ad832bc336a0da4b5b05c5bb4e8629f7d3 Mon Sep 17 00:00:00 2001 From: Alexander Akimov Date: Tue, 4 May 2010 09:47:07 +0300 Subject: [PATCH] Changing the identity info API in order to restore buildability --- libsignon-glib/signon-identity.c | 8 ++++---- libsignon-glib/signon-identity.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libsignon-glib/signon-identity.c b/libsignon-glib/signon-identity.c index 66db4ec..e2a89c9 100644 --- a/libsignon-glib/signon-identity.c +++ b/libsignon-glib/signon-identity.c @@ -1026,7 +1026,7 @@ identity_ptrarray_to_identity_info (const GPtrArray *identity_array) /* get the type (gint) */ value = g_ptr_array_index (identity_array, 7); g_assert (G_VALUE_HOLDS_INT(value)); - signon_identity_info_set_type (info, g_value_get_int (value)); + signon_identity_info_set_identity_type (info, g_value_get_int (value)); g_value_unset (value); return info; @@ -1482,7 +1482,7 @@ SignonIdentityInfo *signon_identity_info_copy (const SignonIdentityInfo *other) signon_identity_info_set_access_control_list (info, signon_identity_info_get_access_control_list (other)); - signon_identity_info_set_type (info, signon_identity_info_get_type (other)); + signon_identity_info_set_identity_type (info, signon_identity_info_get_identity_type (other)); return info; } @@ -1529,7 +1529,7 @@ const gchar* const *signon_identity_info_get_access_control_list (const SignonId return (const gchar* const *)info->access_control_list; } -SignonIdentityType signon_identity_info_get_type (const SignonIdentityInfo *info) +SignonIdentityType signon_identity_info_get_identity_type (const SignonIdentityInfo *info) { g_return_val_if_fail (info != NULL, -1); return (SignonIdentityType)info->type; @@ -1602,7 +1602,7 @@ void signon_identity_info_set_access_control_list (SignonIdentityInfo *info, info->access_control_list = g_strdupv ((gchar **)access_control_list); } -void signon_identity_info_set_type (SignonIdentityInfo *info, SignonIdentityType type) +void signon_identity_info_set_identity_type (SignonIdentityInfo *info, SignonIdentityType type) { g_return_if_fail (info != NULL); info->type = (gint)type; diff --git a/libsignon-glib/signon-identity.h b/libsignon-glib/signon-identity.h index d73dcfd..b3eda71 100644 --- a/libsignon-glib/signon-identity.h +++ b/libsignon-glib/signon-identity.h @@ -170,7 +170,7 @@ const gchar* const *signon_identity_info_get_realms (const SignonIdentityInfo *i const gchar* const *signon_identity_info_get_access_control_list (const SignonIdentityInfo *info); -SignonIdentityType signon_identity_info_get_type (const SignonIdentityInfo *info); +SignonIdentityType signon_identity_info_get_identity_type (const SignonIdentityInfo *info); void signon_identity_info_set_username (SignonIdentityInfo *info, const gchar *username); @@ -186,7 +186,7 @@ void signon_identity_info_set_realms (SignonIdentityInfo *info, const gchar* con void signon_identity_info_set_access_control_list (SignonIdentityInfo *info, const gchar* const *access_control_list); -void signon_identity_info_set_type (SignonIdentityInfo *info, SignonIdentityType type); +void signon_identity_info_set_identity_type (SignonIdentityInfo *info, SignonIdentityType type); G_END_DECLS -- 2.7.4