From 47d743e2e41632419090f9966fac7431bedb66d0 Mon Sep 17 00:00:00 2001 From: Jim Norman Date: Tue, 23 May 2006 20:55:58 +0000 Subject: [PATCH] Fix gnome dependency problem --- c_adlib/ad_gk/native/casa-gnome-keyring.h | 46 ++++++++++++++++++++--- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/c_adlib/ad_gk/native/casa-gnome-keyring.h b/c_adlib/ad_gk/native/casa-gnome-keyring.h index 1eb435fc..17f1bc37 100644 --- a/c_adlib/ad_gk/native/casa-gnome-keyring.h +++ b/c_adlib/ad_gk/native/casa-gnome-keyring.h @@ -86,7 +86,7 @@ typedef enum { CASA_GNOME_KEYRING_ATTRIBUTE_TYPE_STRING, CASA_GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 -} CASAGnomeKeyringAttributeType; +} CASA_GnomeKeyringAttributeType; #define GNOME_KEYRING_ATTRIBUTE_TYPE_STRING CASA_GNOME_KEYRING_ATTRIBUTE_TYPE_STRING #define GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 CASA_GNOME_KEYRING_ATTRIBUTE_TYPE_UINT32 @@ -230,12 +230,14 @@ void CASA_gnome_keyring_attribute_list_append_uint32 #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 ( @@ -301,6 +303,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, @@ -309,8 +312,9 @@ gpointer CASA_gnome_keyring_list_keyring_names ); #define gnome_keyring_list_keyring_names CASA_gnome_keyring_list_keyring_names +#endif -GASA_GnomeKeyringResult CASA_gnome_keyring_list_keyring_names_sync +CASA_GnomeKeyringResult CASA_gnome_keyring_list_keyring_names_sync ( GList **keyrings ); @@ -331,6 +335,9 @@ CASA_GnomeKeyringResult 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, @@ -341,6 +348,7 @@ gpointer CASA_gnome_keyring_create ); #define gnome_keyring_create CASA_gnome_keyring_create +#endif CASA_GnomeKeyringResult CASA_gnome_keyring_create_sync ( @@ -350,6 +358,7 @@ 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, @@ -360,6 +369,7 @@ gpointer CASA_gnome_keyring_unlock ); #define gnome_keyring_unlock CASA_gnome_keyring_unlock +#endif CASA_GnomeKeyringResult CASA_gnome_keyring_unlock_sync ( @@ -403,6 +413,7 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_delete_sync #define gnome_keyring_delete_sync CASA_gnome_keyring_delete_sync +#ifdef dynproto gpointer CASA_gnome_keyring_get_info ( const char *keyring, @@ -412,6 +423,7 @@ gpointer CASA_gnome_keyring_get_info ); #define gnome_keyring_get_info CASA_gnome_keyring_get_info +#endif CASA_GnomeKeyringResult CASA_gnome_keyring_get_info_sync ( @@ -421,6 +433,7 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_get_info_sync #define gnome_keyring_get_info_sync CASA_gnome_keyring_get_info_sync +#ifdef dynproto gpointer CASA_gnome_keyring_set_info ( const char *keyring, @@ -431,6 +444,7 @@ gpointer CASA_gnome_keyring_set_info ); #define gnome_keyring_set_info CASA_gnome_keyring_set_info +#endif CASA_GnomeKeyringResult CASA_gnome_keyring_set_info_sync ( @@ -441,6 +455,7 @@ 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, @@ -450,6 +465,7 @@ gpointer CASA_gnome_keyring_list_item_ids ); #define gnome_keyring_list_item_ids CASA_gnome_keyring_list_item_ids +#endif CASA_GnomeKeyringResult CASA_gnome_keyring_list_item_ids_sync ( @@ -480,6 +496,7 @@ 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 @@ -516,13 +533,13 @@ time_t CASA_gnome_keyring_info_get_ctime #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 ( @@ -564,6 +581,7 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_find_itemsv_sync #define gnome_keyring_find_itemsv_sync CASA_gnome_keyring_find_itemsv_sync +#ifdef dynproto gpointer CASA_gnome_keyring_item_create ( const char *keyring, @@ -578,6 +596,7 @@ gpointer CASA_gnome_keyring_item_create ); #define gnome_keyring_item_create CASA_gnome_keyring_item_create +#endif CASA_GnomeKeyringResult CASA_gnome_keyring_item_create_sync ( @@ -592,16 +611,18 @@ 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, - CASA_GDestroyNotify destroy_data + GDestroyNotify destroy_data ); #define gnome_keyring_item_delete CASA_gnome_keyring_item_delete +#endif CASA_GnomeKeyringResult CASA_gnome_keyring_item_delete_sync ( @@ -611,6 +632,7 @@ 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, @@ -621,6 +643,7 @@ gpointer CASA_gnome_keyring_item_get_info ); #define gnome_keyring_item_get_info CASA_gnome_keyring_item_get_info +#endif CASA_GnomeKeyringResult CASA_gnome_keyring_item_get_info_sync ( @@ -631,6 +654,7 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_item_get_info_sync #define gnome_keyring_item_get_info_sync CASA_gnome_keyring_item_get_info_sync +#ifdef dynproto gpointer CASA_gnome_keyring_item_set_info ( const char *keyring, @@ -642,6 +666,7 @@ gpointer CASA_gnome_keyring_item_set_info ); #define gnome_keyring_item_set_info CASA_gnome_keyring_item_set_info +#endif CASA_GnomeKeyringResult CASA_gnome_keyring_item_set_info_sync ( @@ -652,6 +677,7 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_item_set_info_sync #define gnome_keyring_item_set_info_sync CASA_gnome_keyring_item_set_info_sync +#ifdef dynproto gpointer CASA_gnome_keyring_item_get_attributes ( const char *keyring, @@ -662,6 +688,7 @@ gpointer CASA_gnome_keyring_item_get_attributes ); #define gnome_keyring_item_get_attributes CASA_gnome_keyring_item_get_attributes +#endif CASA_GnomeKeyringResult CASA_gnome_keyring_item_get_attributes_sync ( @@ -672,6 +699,7 @@ CASA_GnomeKeyringResult CASA_gnome_keyring_item_get_attributes_sync #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, @@ -683,6 +711,7 @@ gpointer CASA_gnome_keyring_item_set_attributes ); #define gnome_keyring_item_set_attributes CASA_gnome_keyring_item_set_attributes +#endif CASA_GnomeKeyringResult CASA_gnome_keyring_item_set_attributes_sync ( @@ -736,17 +765,21 @@ CASA_GnomeKeyringResult 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); #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 ( @@ -756,6 +789,7 @@ void CASA_gnome_keyring_item_info_set_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 @@ -769,6 +803,7 @@ void 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 ( @@ -778,12 +813,13 @@ void CASA_gnome_keyring_item_info_set_display_name #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); #define gnome_keyring_application_ref_new CASA_gnome_keyring_application_ref_new