diff --git a/CASA.changes b/CASA.changes index 3e5eba65..e3665764 100644 --- a/CASA.changes +++ b/CASA.changes @@ -1,4 +1,8 @@ -------------------------------------------------------------------- +-------------------------------------------------------------------- +Thursday May 25 09:21:53 MST 2006 - cmashayekhi@novell.com +- casa-gnome-keyring.h was cleaned up. + +------------------------------------------------------------------ Tuesday May 23 14:15:21 MST 2006 - cmashayekhi@novell.com - Eliminated the gnome-kering.h header file. diff --git a/c_adlib/ad_gk/native/casa-gnome-keyring.h b/c_adlib/ad_gk/native/casa-gnome-keyring.h index 17f1bc37..328be290 100644 --- a/c_adlib/ad_gk/native/casa-gnome-keyring.h +++ b/c_adlib/ad_gk/native/casa-gnome-keyring.h @@ -37,7 +37,7 @@ typedef enum CASA_GNOME_KEYRING_RESULT_IO_ERROR, CASA_GNOME_KEYRING_RESULT_CANCELLED, CASA_GNOME_KEYRING_RESULT_ALREADY_EXISTS -} CASA_GnomeKeyringResult; +} CASA_GnomeKeyringResult_T; #define GNOME_KEYRING_RESULT_OK CASA_GNOME_KEYRING_RESULT_OK #define GNOME_KEYRING_RESULT_DENIED CASA_GNOME_KEYRING_RESULT_DENIED @@ -49,7 +49,7 @@ typedef enum #define GNOME_KEYRING_RESULT_CANCELLED CASA_GNOME_KEYRING_RESULT_CANCELLED #define GNOME_KEYRING_RESULT_ALREADY_EXISTS CASA_GNOME_KEYRING_RESULT_ALREADY_EXISTS -#define GnomeKeyringResult CASA_GnomeKeyringResult +#define GnomeKeyringResult CASA_GnomeKeyringResult_T typedef enum { @@ -58,7 +58,7 @@ typedef enum CASA_GNOME_KEYRING_ITEM_NOTE, CASA_GNOME_KEYRING_ITEM_LAST_TYPE, CASA_GNOME_KEYRING_ITEM_NO_TYPE = 0xffffffff, -} CASA_GnomeKeyringItemType; +} CASA_GnomeKeyringItemType_T; #define GNOME_KEYRING_ITEM_GENERIC_SECRET CASA_GNOME_KEYRING_ITEM_GENERIC_SECRET #define GNOME_KEYRING_ITEM_NETWORK_PASSWORD CASA_GNOME_KEYRING_ITEM_NETWORK_PASSWORD @@ -66,145 +66,132 @@ typedef enum #define GNOME_KEYRING_ITEM_LAST_TYPE CASA_GNOME_KEYRING_ITEM_LAST_TYPE #define GNOME_KEYRING_ITEM_NO_TYPE CASA_GNOME_KEYRING_ITEM_NO_TYPE -#define GnomeKeyringItemType CASA_GnomeKeyringItemType - -typedef enum -{ - CASA_GNOME_KEYRING_ACCESS_ASK, - CASA_GNOME_KEYRING_ACCESS_DENY, - CASA_GNOME_KEYRING_ACCESS_ALLOW -} CASA_GnomeKeyringAccessRestriction; - -#define GNOME_KEYRING_ACCESS_ASK CASA_GNOME_KEYRING_ACCESS_ASK -#define GNOME_KEYRING_ACCESS_DENY CASA_GNOME_KEYRING_ACCESS_DENY -#define GNOME_KEYRING_ACCESS_ALLOW CASA_GNOME_KEYRING_ACCESS_ALLOW - -#define GnomeKeyringAccessRestriction CASA_GnomeKeyringAccessRestriction +#define GnomeKeyringItemType CASA_GnomeKeyringItemType_T typedef enum { CASA_GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, CASA_GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 -} CASA_GnomeKeyringAttributeType; +} CASA_GnomeKeyringAttributeType_T; #define GNOME_KEYRING_ATTRIBUTE_TYPE_STRING CASA_GNOME_KEYRING_ATTRIBUTE_TYPE_STRING #define GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 CASA_GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 -#define GnomeKeyringAttributeType CASA_GnomeKeyringAttributeType +#define GnomeKeyringAttributeType CASA_GnomeKeyringAttributeType_T -typedef struct GnomeKeyringAccessControl CASA_GnomeKeyringAccessControl; -typedef struct GnomeKeyringApplicationRef CASA_GnomeKeyringApplicationRef; -typedef GArray CASA_GnomeKeyringAttributeList; +typedef struct GnomeKeyringAccessControl CASA_GnomeKeyringAccessControl_T; +typedef struct GnomeKeyringApplicationRef CASA_GnomeKeyringApplicationRef_T; +typedef GArray CASA_GnomeKeyringAttributeList_T; -#define GnomeKeyringAccessControl CASA_GnomeKeyringAccessControl -#define GnomeKeyringApplicationRef CASA_GnomeKeyringApplicationRef -#define GnomeKeyringAttributeList CASA_GnomeKeyringAttributeList +#define GnomeKeyringAccessControl CASA_GnomeKeyringAccessControl_T +#define GnomeKeyringApplicationRef CASA_GnomeKeyringApplicationRef_T +#define GnomeKeyringAttributeList CASA_GnomeKeyringAttributeList_T typedef enum { CASA_GNOME_KEYRING_ACCESS_READ = 1<<0, CASA_GNOME_KEYRING_ACCESS_WRITE = 1<<1, CASA_GNOME_KEYRING_ACCESS_REMOVE = 1<<2 -} CASA_GnomeKeyringAccessType; +} CASA_GnomeKeyringAccessType_T; #define GNOME_KEYRING_ACCESS_READ CASA_GNOME_KEYRING_ACCESS_READ #define GNOME_KEYRING_ACCESS_WRITE CASA_GNOME_KEYRING_ACCESS_WRITE #define GNOME_KEYRING_ACCESS_REMOVE CASA_GNOME_KEYRING_ACCESS_REMOVE -#define GnomeKeyringAccessType CASA_GnomeKeyringAccessType +#define GnomeKeyringAccessType CASA_GnomeKeyringAccessType_T -typedef struct GnomeKeyringInfo CASA_GnomeKeyringInfo; -typedef struct GnomeKeyringItemInfo CASA_GnomeKeyringItemInfo; +typedef struct GnomeKeyringInfo CASA_GnomeKeyringInfo_T; +typedef struct GnomeKeyringItemInfo CASA_GnomeKeyringItemInfo_T; -#define GnomeKeyringInfo CASA_GnomeKeyringInfo -#define GnomeKeyringItemInfo CASA_GnomeKeyringItemInfo +#define GnomeKeyringInfo CASA_GnomeKeyringInfo_T +#define GnomeKeyringItemInfo CASA_GnomeKeyringItemInfo_T typedef struct { - char *name; - CASA_GnomeKeyringAttributeType type; + char *name; + CASA_GnomeKeyringAttributeType_T type; union { - char *string; - guint32 integer; + char *string; + guint32 integer; } value; -} CASA_GnomeKeyringAttribute; +} CASA_GnomeKeyringAttribute_T; -#define GnomeKeyringAttribute CASA_GnomeKeyringAttribute +#define GnomeKeyringAttribute CASA_GnomeKeyringAttribute_T typedef struct { char *keyring; guint item_id; - CASA_GnomeKeyringAttributeList *attributes; + CASA_GnomeKeyringAttributeList_T *attributes; char *secret; -} CASA_GnomeKeyringFound; +} CASA_GnomeKeyringFound_T; -#define GnomeKeyringFound CASA_GnomeKeyringFound +#define GnomeKeyringFound CASA_GnomeKeyringFound_T -typedef void (*CASA_GnomeKeyringOperationDoneCallback) +typedef void (*CASA_GnomeKeyringOperationDoneCallback_T) ( - CASA_GnomeKeyringResult result, + CASA_GnomeKeyringResult_T result, gpointer data ); -#define GnomeKeyringOperationDoneCallback CASA_GnomeKeyringOperationDoneCallback +#define GnomeKeyringOperationDoneCallback CASA_GnomeKeyringOperationDoneCallback_T -typedef void (*CASA_GnomeKeyringOperationGetStringCallback) +typedef void (*CASA_GnomeKeyringOperationGetStringCallback_T) ( - CASA_GnomeKeyringResult result, + CASA_GnomeKeyringResult_T result, const char *string, gpointer data ); -#define GnomeKeyringOperationGetStringCallback CASA_GnomeKeyringOperationGetStringCallback +#define GnomeKeyringOperationGetStringCallback CASA_GnomeKeyringOperationGetStringCallback_T -typedef void (*CASA_GnomeKeyringOperationGetIntCallback) +typedef void (*CASA_GnomeKeyringOperationGetIntCallback_T) ( - CASA_GnomeKeyringResult result, + CASA_GnomeKeyringResult_T result, guint32 val, gpointer data ); -#define GnomeKeyringOperationGetIntCallback CASA_GnomeKeyringOperationGetIntCallback +#define GnomeKeyringOperationGetIntCallback CASA_GnomeKeyringOperationGetIntCallback_T -typedef void (*CASA_GnomeKeyringOperationGetListCallback) +typedef void (*CASA_GnomeKeyringOperationGetListCallback_T) ( - CASA_GnomeKeyringResult result, + CASA_GnomeKeyringResult_T result, GList *list, gpointer data ); -#define GnomeKeyringOperationGetListCallback CASA_GnomeKeyringOperationGetListCallback +#define GnomeKeyringOperationGetListCallback CASA_GnomeKeyringOperationGetListCallback_T -typedef void (*CASA_GnomeKeyringOperationGetKeyringInfoCallback) +typedef void (*CASA_GnomeKeyringOperationGetKeyringInfoCallback_T) ( - CASA_GnomeKeyringResult result, - CASA_GnomeKeyringInfo *info, + CASA_GnomeKeyringResult_T result, + CASA_GnomeKeyringInfo_T *info, gpointer data ); -#define GnomeKeyringOperationGetKeyringInfoCallback CASA_GnomeKeyringOperationGetKeyringInfoCallback +#define GnomeKeyringOperationGetKeyringInfoCallback CASA_GnomeKeyringOperationGetKeyringInfoCallback_T -typedef void (*CASA_GnomeKeyringOperationGetItemInfoCallback) +typedef void (*CASA_GnomeKeyringOperationGetItemInfoCallback_T) ( - CASA_GnomeKeyringResult result, - CASA_GnomeKeyringItemInfo*info, + CASA_GnomeKeyringResult_T result, + CASA_GnomeKeyringItemInfo_T*info, gpointer data ); -#define GnomeKeyringOperationGetItemInfoCallback CASA_GnomeKeyringOperationGetItemInfoCallback +#define GnomeKeyringOperationGetItemInfoCallback CASA_GnomeKeyringOperationGetItemInfoCallback_T -typedef void (*CASA_GnomeKeyringOperationGetAttributesCallback) +typedef void (*CASA_GnomeKeyringOperationGetAttributesCallback_T) ( - CASA_GnomeKeyringResult result, - CASA_GnomeKeyringAttributeList *attributes, + CASA_GnomeKeyringResult_T result, + CASA_GnomeKeyringAttributeList_T *attributes, gpointer data ); -#define GnomeKeyringOperationGetAttributesCallback CASA_GnomeKeyringOperationGetAttributesCallback +#define GnomeKeyringOperationGetAttributesCallback CASA_GnomeKeyringOperationGetAttributesCallback_T #define CASA_gnome_keyring_attribute_list_index(a, i) g_array_index ((a), GnomeKeyringAttribute, (i)) #define gnome_keyring_attribute_list_index CASA_gnome_keyring_attribute_list_index @@ -214,7 +201,7 @@ typedef void (*CASA_GnomeKeyringOperationGetAttributesCallback) void CASA_gnome_keyring_attribute_list_append_string ( - CASA_GnomeKeyringAttributeList *attributes, + CASA_GnomeKeyringAttributeList_T *attributes, const char *attribute, const char *value ); @@ -223,25 +210,16 @@ void CASA_gnome_keyring_attribute_list_append_string void CASA_gnome_keyring_attribute_list_append_uint32 ( - CASA_GnomeKeyringAttributeList *attributes, + CASA_GnomeKeyringAttributeList_T *attributes, const char *attribute, guint32 value ); #define gnome_keyring_attribute_list_append_uint32 CASA_gnome_keyring_attribute_list_append_uint32 -#ifdef dynproto -void CASA_gnome_keyring_attribute_list_free - ( - CASA_GnomeKeyringAttributeList *attributes - ); - -#define gnome_keyring_attribute_list_free CASA_gnome_keyring_attribute_list_free -#endif - GnomeKeyringAttributeList *CASA_gnome_keyring_attribute_list_copy ( - CASA_GnomeKeyringAttributeList *attributes + CASA_GnomeKeyringAttributeList_T *attributes ); #define gnome_keyring_attribute_list_copy CASA_gnome_keyring_attribute_list_copy @@ -254,7 +232,7 @@ void CASA_gnome_keyring_free_password (char *password); #define gnome_keyring_free_password CASA_gnome_keyring_free_password -void CASA_gnome_keyring_found_free (GnomeKeyringFound *found); +void CASA_gnome_keyring_found_free (CASA_GnomeKeyringFound_T *found); #define gnome_keyring_found_free CASA_gnome_keyring_found_free @@ -269,7 +247,7 @@ void CASA_gnome_keyring_cancel_request (gpointer request); gpointer CASA_gnome_keyring_set_default_keyring ( const char *keyring, - CASA_GnomeKeyringOperationDoneCallback callback, + CASA_GnomeKeyringOperationDoneCallback_T callback, gpointer data, GDestroyNotify destroy_data ); @@ -277,7 +255,7 @@ gpointer CASA_gnome_keyring_set_default_keyring #define gnome_keyring_set_default_keyring CASA_gnome_keyring_set_default_keyring -CASA_GnomeKeyringResult CASA_gnome_keyring_set_default_keyring_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_set_default_keyring_sync ( const char *keyring ); @@ -287,7 +265,7 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_set_default_keyring_sync gpointer CASA_gnome_keyring_get_default_keyring ( - CASA_GnomeKeyringOperationGetStringCallback callback, + CASA_GnomeKeyringOperationGetStringCallback_T callback, gpointer data, GDestroyNotify destroy_data ); @@ -295,7 +273,7 @@ gpointer CASA_gnome_keyring_get_default_keyring #define gnome_keyring_get_default_keyring CASA_gnome_keyring_get_default_keyring -CASA_GnomeKeyringResult CASA_gnome_keyring_get_default_keyring_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_get_default_keyring_sync ( char **keyring ); @@ -303,18 +281,7 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_get_default_keyring_sync #define gnome_keyring_get_default_keyring_sync CASA_gnome_keyring_get_default_keyring_sync -#ifdef dynproto -gpointer CASA_gnome_keyring_list_keyring_names - ( - CASA_GnomeKeyringOperationGetListCallback callback, - gpointer data, - GDestroyNotify destroy_data - ); - -#define gnome_keyring_list_keyring_names CASA_gnome_keyring_list_keyring_names -#endif - -CASA_GnomeKeyringResult CASA_gnome_keyring_list_keyring_names_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_list_keyring_names_sync ( GList **keyrings ); @@ -323,34 +290,21 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_list_keyring_names_sync gpointer CASA_gnome_keyring_lock_all ( - CASA_GnomeKeyringOperationDoneCallback callback, + CASA_GnomeKeyringOperationDoneCallback_T callback, gpointer data, GDestroyNotify destroy_data ); #define gnome_keyring_lock_all CASA_gnome_keyring_lock_all -CASA_GnomeKeyringResult CASA_gnome_keyring_lock_all_sync(void); +CASA_GnomeKeyringResult_T CASA_gnome_keyring_lock_all_sync(void); #define gnome_keyring_lock_all_sync CASA_gnome_keyring_lock_all_sync /* NULL password means ask user */ -#ifdef dynproto -gpointer CASA_gnome_keyring_create - ( - const char *keyring_name, - const char *password, - CASA_GnomeKeyringOperationDoneCallback callback, - gpointer data, - GDestroyNotify destroy_data - ); - -#define gnome_keyring_create CASA_gnome_keyring_create -#endif - -CASA_GnomeKeyringResult CASA_gnome_keyring_create_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_create_sync ( const char *keyring_name, const char *password @@ -358,20 +312,8 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_create_sync #define gnome_keyring_create_sync CASA_gnome_keyring_create_sync -#ifdef dynproto -gpointer CASA_gnome_keyring_unlock - ( - const char *keyring, - const char *password, - CASA_GnomeKeyringOperationDoneCallback callback, - gpointer data, - GDestroyNotify destroy_data - ); -#define gnome_keyring_unlock CASA_gnome_keyring_unlock -#endif - -CASA_GnomeKeyringResult CASA_gnome_keyring_unlock_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_unlock_sync ( const char *keyring, const char *password @@ -382,14 +324,14 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_unlock_sync gpointer CASA_gnome_keyring_lock ( const char *keyring, - CASA_GnomeKeyringOperationDoneCallback callback, + CASA_GnomeKeyringOperationDoneCallback_T callback, gpointer data, GDestroyNotify destroy_data ); #define gnome_keyring_lock CASA_gnome_keyring_lock -CASA_GnomeKeyringResult CASA_gnome_keyring_lock_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_lock_sync ( const char *keyring ); @@ -399,54 +341,31 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_lock_sync gpointer CASA_gnome_keyring_delete ( const char *keyring, - CASA_GnomeKeyringOperationDoneCallback callback, + CASA_GnomeKeyringOperationDoneCallback_T callback, gpointer data, GDestroyNotify destroy_data ); #define gnome_keyring_delete CASA_gnome_keyring_delete -CASA_GnomeKeyringResult CASA_gnome_keyring_delete_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_delete_sync ( const char *keyring ); #define gnome_keyring_delete_sync CASA_gnome_keyring_delete_sync -#ifdef dynproto -gpointer CASA_gnome_keyring_get_info - ( - const char *keyring, - CASA_GnomeKeyringOperationGetKeyringInfoCallback callback, - gpointer data, - GDestroyNotify destroy_data - ); -#define gnome_keyring_get_info CASA_gnome_keyring_get_info -#endif - -CASA_GnomeKeyringResult CASA_gnome_keyring_get_info_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_get_info_sync ( const char *keyring, - CASA_GnomeKeyringInfo **info + CASA_GnomeKeyringInfo_T **info ); #define gnome_keyring_get_info_sync CASA_gnome_keyring_get_info_sync -#ifdef dynproto -gpointer CASA_gnome_keyring_set_info - ( - const char *keyring, - CASA_GnomeKeyringInfo *info, - CASA_GnomeKeyringOperationDoneCallback callback, - gpointer data, - GDestroyNotify destroy_data - ); -#define gnome_keyring_set_info CASA_gnome_keyring_set_info -#endif - -CASA_GnomeKeyringResult CASA_gnome_keyring_set_info_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_set_info_sync ( const char *keyring, GnomeKeyringInfo *info @@ -455,19 +374,8 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_set_info_sync #define gnome_keyring_set_info_sync CASA_gnome_keyring_set_info_sync -#ifdef dynproto -gpointer CASA_gnome_keyring_list_item_ids - ( - const char *keyring, - CASA_GnomeKeyringOperationGetListCallback callback, - gpointer data, - GDestroyNotify destroy_data - ); -#define gnome_keyring_list_item_ids CASA_gnome_keyring_list_item_ids -#endif - -CASA_GnomeKeyringResult CASA_gnome_keyring_list_item_ids_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_list_item_ids_sync ( const char *keyring, GList **ids @@ -477,14 +385,14 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_list_item_ids_sync void CASA_gnome_keyring_info_free ( - CASA_GnomeKeyringInfo *keyring_info + CASA_GnomeKeyringInfo_T *keyring_info ); #define gnome_keyring_info_free CASA_gnome_keyring_info_free -CASA_GnomeKeyringInfo *CASA_gnome_keyring_info_copy +CASA_GnomeKeyringInfo_T *CASA_gnome_keyring_info_copy ( - CASA_GnomeKeyringInfo *keyring_info + CASA_GnomeKeyringInfo_T *keyring_info ); @@ -496,56 +404,12 @@ void CASA_gnome_keyring_info_set_lock_on_idle gboolean value ); -#ifdef dynproto -gboolean CASA_gnome_keyring_info_get_lock_on_idle - ( - CASA_GnomeKeyringInfo *keyring_info - ); - -#define gnome_keyring_info_get_lock_on_idle - -void CASA_gnome_keyring_info_set_lock_timeout - ( - CASA_GnomeKeyringInfo *keyring_info, - guint32 value - ); - -#define gnome_keyring_info_set_lock_timeout CASA_gnome_keyring_info_set_lock_timeout - -guint32 CASA_gnome_keyring_info_get_lock_timeout - ( - CASA_GnomeKeyringInfo *keyring_info - ); - -#define gnome_keyring_info_get_lock_timeout CASA_gnome_keyring_info_get_lock_timeout - -time_t CASA_gnome_keyring_info_get_mtime - ( - GnomeKeyringInfo *keyring_info - ); - -#define gnome_keyring_info_get_mtime CASA_gnome_keyring_info_get_mtime - -time_t CASA_gnome_keyring_info_get_ctime - ( - CASA_GnomeKeyringInfo *keyring_info - ); - -#define gnome_keyring_info_get_ctime CASA_gnome_keyring_info_get_ctime - -gboolean CASA_gnome_keyring_info_get_is_locked - ( - CASA_GnomeKeyringInfo *keyring_info - ); - -#define gnome_keyring_info_get_is_locked CASA_gnome_keyring_info_get_is_locked -#endif gpointer CASA_gnome_keyring_find_items ( - CASA_GnomeKeyringItemType type, - CASA_GnomeKeyringAttributeList *attributes, - CASA_GnomeKeyringOperationGetListCallback callback, + CASA_GnomeKeyringItemType_T type, + CASA_GnomeKeyringAttributeList_T *attributes, + CASA_GnomeKeyringOperationGetListCallback_T callback, gpointer data, GDestroyNotify destroy_data ); @@ -554,8 +418,8 @@ gpointer CASA_gnome_keyring_find_items gpointer CASA_gnome_keyring_find_itemsv ( - CASA_GnomeKeyringItemType type, - CASA_GnomeKeyringOperationGetListCallback callback, + CASA_GnomeKeyringItemType_T type, + CASA_GnomeKeyringOperationGetListCallback_T callback, gpointer data, GDestroyNotify destroy_data, ... @@ -563,47 +427,31 @@ gpointer CASA_gnome_keyring_find_itemsv #define gnome_keyring_find_itemsv CASA_gnome_keyring_find_itemsv -CASA_GnomeKeyringResult CASA_gnome_keyring_find_items_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_find_items_sync ( - CASA_GnomeKeyringItemType type, - CASA_GnomeKeyringAttributeList *attributes, + CASA_GnomeKeyringItemType_T type, + CASA_GnomeKeyringAttributeList_T *attributes, GList **found ); #define gnome_keyring_find_items_sync CASA_gnome_keyring_find_items_sync -CASA_GnomeKeyringResult CASA_gnome_keyring_find_itemsv_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_find_itemsv_sync ( - CASA_GnomeKeyringItemType type, + CASA_GnomeKeyringItemType_T type, GList **found, ... ); #define gnome_keyring_find_itemsv_sync CASA_gnome_keyring_find_itemsv_sync -#ifdef dynproto -gpointer CASA_gnome_keyring_item_create - ( - const char *keyring, - CASA_GnomeKeyringItemType type, - const char *display_name, - CASA_GnomeKeyringAttributeList *attributes, - const char *secret, - gboolean update_if_exists, - CASA_GnomeKeyringOperationGetIntCallback callback, - gpointer data, - GDestroyNotify destroy_data - ); -#define gnome_keyring_item_create CASA_gnome_keyring_item_create -#endif - -CASA_GnomeKeyringResult CASA_gnome_keyring_item_create_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_item_create_sync ( const char *keyring, - CASA_GnomeKeyringItemType type, + CASA_GnomeKeyringItemType_T type, const char *display_name, - CASA_GnomeKeyringAttributeList *attributes, + CASA_GnomeKeyringAttributeList_T *attributes, const char *secret, gboolean update_if_exists, guint32 *item_id @@ -611,20 +459,8 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_item_create_sync #define gnome_keyring_item_create_sync CASA_gnome_keyring_item_create_sync -#ifdef dynproto -gpointer CASA_gnome_keyring_item_delete - ( - const char *keyring, - guint32 id, - CASA_GnomeKeyringOperationDoneCallback callback, - gpointer data, - GDestroyNotify destroy_data - ); -#define gnome_keyring_item_delete CASA_gnome_keyring_item_delete -#endif - -CASA_GnomeKeyringResult CASA_gnome_keyring_item_delete_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_item_delete_sync ( const char *keyring, guint32 id @@ -632,92 +468,42 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_item_delete_sync #define gnome_keyring_item_delete_sync CASA_gnome_keyring_item_delete_sync -#ifdef dynproto -gpointer CASA_gnome_keyring_item_get_info - ( - const char *keyring, - guint32 id, - CASA_GnomeKeyringOperationGetItemInfoCallback callback, - gpointer data, - GDestroyNotify destroy_data - ); -#define gnome_keyring_item_get_info CASA_gnome_keyring_item_get_info -#endif - -CASA_GnomeKeyringResult CASA_gnome_keyring_item_get_info_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_item_get_info_sync ( const char *keyring, guint32 id, - CASA_GnomeKeyringItemInfo **info + CASA_GnomeKeyringItemInfo_T **info ); #define gnome_keyring_item_get_info_sync CASA_gnome_keyring_item_get_info_sync -#ifdef dynproto -gpointer CASA_gnome_keyring_item_set_info + +CASA_GnomeKeyringResult_T CASA_gnome_keyring_item_set_info_sync ( const char *keyring, guint32 id, - CASA_GnomeKeyringItemInfo *info, - CASA_GnomeKeyringOperationDoneCallback callback, - gpointer data, - GDestroyNotify destroy_data - ); - -#define gnome_keyring_item_set_info CASA_gnome_keyring_item_set_info -#endif - -CASA_GnomeKeyringResult CASA_gnome_keyring_item_set_info_sync - ( - const char *keyring, - guint32 id, - CASA_GnomeKeyringItemInfo *info + CASA_GnomeKeyringItemInfo_T *info ); #define gnome_keyring_item_set_info_sync CASA_gnome_keyring_item_set_info_sync -#ifdef dynproto -gpointer CASA_gnome_keyring_item_get_attributes + +CASA_GnomeKeyringResult_T CASA_gnome_keyring_item_get_attributes_sync ( const char *keyring, guint32 id, - CASA_GnomeKeyringOperationGetAttributesCallback callback, - gpointer data, - GDestroyNotify destroy_data - ); - -#define gnome_keyring_item_get_attributes CASA_gnome_keyring_item_get_attributes -#endif - -CASA_GnomeKeyringResult CASA_gnome_keyring_item_get_attributes_sync - ( - const char *keyring, - guint32 id, - CASA_GnomeKeyringAttributeList **attributes + CASA_GnomeKeyringAttributeList_T **attributes ); #define gnome_keyring_item_get_attributes_sync CASA_gnome_keyring_item_get_attributes_sync -#ifdef dynproto -gpointer CASA_gnome_keyring_item_set_attributes - ( - const char *keyring, - guint32 id, - CASA_GnomeKeyringAttributeList *attributes, - CASA_GnomeKeyringOperationDoneCallback callback, - gpointer data, - GDestroyNotify destroy_data - ); -#define gnome_keyring_item_set_attributes CASA_gnome_keyring_item_set_attributes -#endif - -CASA_GnomeKeyringResult CASA_gnome_keyring_item_set_attributes_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_item_set_attributes_sync ( const char *keyring, guint32 id, - CASA_GnomeKeyringAttributeList *attributes + CASA_GnomeKeyringAttributeList_T *attributes ); #define gnome_keyring_item_set_attributes_sync CASA_gnome_keyring_item_set_attributes_sync @@ -726,14 +512,14 @@ gpointer CASA_gnome_keyring_item_get_acl ( const char *keyring, guint32 id, - CASA_GnomeKeyringOperationGetListCallback callback, + CASA_GnomeKeyringOperationGetListCallback_T callback, gpointer data, GDestroyNotify destroy_data ); #define gnome_keyring_item_get_acl CASA_gnome_keyring_item_get_acl -CASA_GnomeKeyringResult CASA_gnome_keyring_item_get_acl_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_item_get_acl_sync ( const char *keyring, guint32 id, @@ -747,14 +533,14 @@ gpointer CASA_gnome_keyring_item_set_acl const char *keyring, guint32 id, GList *acl, - CASA_GnomeKeyringOperationDoneCallback callback, + CASA_GnomeKeyringOperationDoneCallback_T callback, gpointer data, GDestroyNotify destroy_data ); #define gnome_keyring_item_set_acl CASA_gnome_keyring_item_set_acl -CASA_GnomeKeyringResult CASA_gnome_keyring_item_set_acl_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_item_set_acl_sync ( const char *keyring, guint32 id, @@ -764,86 +550,50 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_item_set_acl_sync #define gnome_keyring_item_set_acl_sync CASA_gnome_keyring_item_set_acl_sync - -#ifdef dynproto -void CASA_gnome_keyring_item_info_free (CASA_GnomeKeyringItemInfo *item_info); -#define gnome_keyring_item_info_free CASA_gnome_keyring_item_info_free - -CASA_GnomeKeyringItemInfo *CASA_gnome_keyring_item_info_new (void); -#define gnome_keyring_item_info_new CASA_gnome_keyring_item_info_new -#endif - -CASA_GnomeKeyringItemInfo *CASA_gnome_keyring_item_info_copy (CASA_GnomeKeyringItemInfo *item_info); +CASA_GnomeKeyringItemInfo_T *CASA_gnome_keyring_item_info_copy (CASA_GnomeKeyringItemInfo_T *item_info); #define gnome_keyring_item_info_copy CASA_gnome_keyring_item_info_copy -#ifdef dynproto -CASA_GnomeKeyringItemType CASA_gnome_keyring_item_info_get_type (CASA_GnomeKeyringItemInfo *item_info); -#define gnome_keyring_item_info_get_type CASA_gnome_keyring_item_info_get_type -#endif - void CASA_gnome_keyring_item_info_set_type ( - CASA_GnomeKeyringItemInfo *item_info, - CASA_GnomeKeyringItemType type + CASA_GnomeKeyringItemInfo_T *item_info, + CASA_GnomeKeyringItemType_T type ); #define gnome_keyring_item_info_set_type CASA_gnome_keyring_item_info_set_type -#ifdef dynproto -char *CASA_gnome_keyring_item_info_get_secret (CASA_GnomeKeyringItemInfo *item_info); -#define gnome_keyring_item_info_get_secret CASA_gnome_keyring_item_info_get_secret - -void CASA_gnome_keyring_item_info_set_secret - ( - CASA_GnomeKeyringItemInfo *item_info, - const char *value - ); - -#define gnome_keyring_item_info_set_secret CASA_gnome_keyring_item_info_set_secret - -char *CASA_gnome_keyring_item_info_get_display_name (CASA_GnomeKeyringItemInfo *item_info); -#define gnome_keyring_item_info_get_display_name CASA_gnome_keyring_item_info_get_display_name -#endif void CASA_gnome_keyring_item_info_set_display_name ( - CASA_GnomeKeyringItemInfo *item_info, + CASA_GnomeKeyringItemInfo_T *item_info, const char *value ); #define gnome_keyring_item_info_set_display_name CASA_gnome_keyring_item_info_set_display_name -#ifdef dynproto -time_t CASA_gnome_keyring_item_info_get_mtime (CASA_GnomeKeyringItemInfo *item_info); -#define gnome_keyring_item_info_get_mtime CASA_gnome_keyring_item_info_get_mtime -time_t CASA_gnome_keyring_item_info_get_ctime (CASA_GnomeKeyringItemInfo *item_info); -#define gnome_keyring_item_info_get_ctime CASA_gnome_keyring_item_info_get_ctime -#endif - -CASA_GnomeKeyringApplicationRef *CASA_gnome_keyring_application_ref_new (void); +CASA_GnomeKeyringApplicationRef_T *CASA_gnome_keyring_application_ref_new (void); #define gnome_keyring_application_ref_new CASA_gnome_keyring_application_ref_new -CASA_GnomeKeyringApplicationRef *CASA_gnome_keyring_application_ref_copy (const CASA_GnomeKeyringApplicationRef *app); +CASA_GnomeKeyringApplicationRef_T *CASA_gnome_keyring_application_ref_copy (const CASA_GnomeKeyringApplicationRef_T *app); #define gnome_keyring_application_ref_copy CASA_gnome_keyring_application_ref_copy -void CASA_gnome_keyring_application_ref_free (CASA_GnomeKeyringApplicationRef *app); +void CASA_gnome_keyring_application_ref_free (CASA_GnomeKeyringApplicationRef_T *app); #define gnome_keyring_application_ref_free CASA_gnome_keyring_application_ref_free -CASA_GnomeKeyringAccessControl *CASA_gnome_keyring_access_control_new +CASA_GnomeKeyringAccessControl_T *CASA_gnome_keyring_access_control_new ( - const CASA_GnomeKeyringApplicationRef *application, - CASA_GnomeKeyringAccessType types_allowed + const CASA_GnomeKeyringApplicationRef_T *application, + CASA_GnomeKeyringAccessType_T types_allowed ); #define gnome_keyring_access_control_new CASA_gnome_keyring_access_control_new -CASA_GnomeKeyringAccessControl *CASA_gnome_keyring_access_control_copy (GnomeKeyringAccessControl *ac); +CASA_GnomeKeyringAccessControl_T *CASA_gnome_keyring_access_control_copy (GnomeKeyringAccessControl *ac); #define gnome_keyring_access_control_copy CASA_gnome_keyring_access_control_copy -void CASA_gnome_keyring_access_control_free (CASA_GnomeKeyringAccessControl *ac); +void CASA_gnome_keyring_access_control_free (CASA_GnomeKeyringAccessControl_T *ac); #define gnome_keyring_access_control_free CASA_gnome_keyring_access_control_free GList * CASA_gnome_keyring_acl_copy (GList *list); @@ -853,35 +603,35 @@ void CASA_gnome_keyring_acl_free (GList *acl); #define gnome_keyring_acl_free CASA_gnome_keyring_acl_free -char *CASA_gnome_keyring_item_ac_get_display_name (CASA_GnomeKeyringAccessControl *ac); +char *CASA_gnome_keyring_item_ac_get_display_name (CASA_GnomeKeyringAccessControl_T *ac); #define gnome_keyring_item_ac_get_display_name CASA_gnome_keyring_item_ac_get_display_name void CASA_gnome_keyring_item_ac_set_display_name ( - CASA_GnomeKeyringAccessControl *ac, + CASA_GnomeKeyringAccessControl_T *ac, const char *value ); #define gnome_keyring_item_ac_set_display_name CASA_gnome_keyring_item_ac_set_display_name -char *CASA_gnome_keyring_item_ac_get_path_name (CASA_GnomeKeyringAccessControl *ac); +char *CASA_gnome_keyring_item_ac_get_path_name (CASA_GnomeKeyringAccessControl_T *ac); #define gnome_keyring_item_ac_get_path_name CASA_gnome_keyring_item_ac_get_path_name void CASA_gnome_keyring_item_ac_set_path_name ( - CASA_GnomeKeyringAccessControl *ac, + CASA_GnomeKeyringAccessControl_T *ac, const char *value ); #define gnome_keyring_item_ac_set_path_name CASA_gnome_keyring_item_ac_set_path_name -CASA_GnomeKeyringAccessType CASA_gnome_keyring_item_ac_get_access_type (CASA_GnomeKeyringAccessControl *ac); +CASA_GnomeKeyringAccessType_T CASA_gnome_keyring_item_ac_get_access_type (CASA_GnomeKeyringAccessControl_T *ac); #define gnome_keyring_item_ac_get_access_type CASA_gnome_keyring_item_ac_get_access_type void CASA_gnome_keyring_item_ac_set_access_type ( - CASA_GnomeKeyringAccessControl *ac, - const CASA_GnomeKeyringAccessType value + CASA_GnomeKeyringAccessControl_T *ac, + const CASA_GnomeKeyringAccessType_T value ); #define gnome_keyring_item_ac_set_access_type CASA_gnome_keyring_item_ac_set_access_type @@ -890,23 +640,21 @@ void CASA_gnome_keyring_item_ac_set_access_type typedef struct { - char *keyring; - guint32 item_id; - - char *protocol; - char *server; - char *object; - char *authtype; + char *keyring; + guint32 item_id; + char *protocol; + char *server; + char *object; + char *authtype; guint32 port; + char *user; + char *domain; + char *password; +} CASA_GnomeKeyringNetworkPasswordData_T; - char *user; - char *domain; - char *password; -} CASA_GnomeKeyringNetworkPasswordData; +#define GnomeKeyringNetworkPasswordData CASA_GnomeKeyringNetworkPasswordData_T -#define GnomeKeyringNetworkPasswordData CASA_GnomeKeyringNetworkPasswordData - -void CASA_gnome_keyring_network_password_free (CASA_GnomeKeyringNetworkPasswordData *data); +void CASA_gnome_keyring_network_password_free (CASA_GnomeKeyringNetworkPasswordData_T *data); #define gnome_keyring_network_password_free CASA_gnome_keyring_network_password_free void CASA_gnome_keyring_network_password_list_free (GList *list); @@ -921,7 +669,7 @@ gpointer CASA_gnome_keyring_find_network_password const char *protocol, const char *authtype, guint32 port, - CASA_GnomeKeyringOperationGetListCallback callback, + CASA_GnomeKeyringOperationGetListCallback_T callback, gpointer data, GDestroyNotify destroy_data ); @@ -929,7 +677,7 @@ gpointer CASA_gnome_keyring_find_network_password #define gnome_keyring_find_network_password CASA_gnome_keyring_find_network_password -CASA_GnomeKeyringResult CASA_gnome_keyring_find_network_password_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_find_network_password_sync ( const char *user, const char *domain, @@ -954,14 +702,14 @@ gpointer CASA_gnome_keyring_set_network_password const char *authtype, guint32 port, const char *password, - CASA_GnomeKeyringOperationGetIntCallback callback, + CASA_GnomeKeyringOperationGetIntCallback_T callback, gpointer data, GDestroyNotify destroy_data ); #define gnome_keyring_set_network_password CASA_gnome_keyring_set_network_password -CASA_GnomeKeyringResult CASA_gnome_keyring_set_network_password_sync +CASA_GnomeKeyringResult_T CASA_gnome_keyring_set_network_password_sync ( const char *keyring, const char *user,