IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix MacOSX keyring test in configure to work and make gnc-keyring.c compile if it does.

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18999 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Mike Alexander 2010-04-06 02:19:25 +00:00
parent fe6d35d6bf
commit 6d6a1eac8a
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.in
View File

@ -1081,15 +1081,16 @@ esac
###----------------------------------------------------------------------- ###-----------------------------------------------------------------------
## Find a suitable password store ## Find a suitable password store
if test x$host_os = xdarwin case $host_os in
then darwin*)
AC_DEFINE(HAVE_OSX_KEYCHAIN,1,[System has an OS X Key chain]) AC_DEFINE(HAVE_OSX_KEYCHAIN,1,[System has an OS X Key chain])
else ;;
*)
PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1 >= "0.6", PKG_CHECK_MODULES(GNOME_KEYRING, gnome-keyring-1 >= "0.6",
[AC_DEFINE(HAVE_GNOME_KEYRING,1,[System has gnome-keyring 0.6 or better])], [AC_DEFINE(HAVE_GNOME_KEYRING,1,[System has gnome-keyring 0.6 or better])],
[AC_DEFINE(HAVE_NO_KEYRING,1,[System has no suitable keyring service])]) [AC_DEFINE(HAVE_NO_KEYRING,1,[System has no suitable keyring service])])
fi esac
### ---------------------------------------------------------------------- ### ----------------------------------------------------------------------
AC_ARG_ENABLE( efence, AC_ARG_ENABLE( efence,

9
src/gnome-utils/gnc-keyring.c
View File

@ -30,7 +30,10 @@
#include <gnome-keyring.h> #include <gnome-keyring.h>
#endif #endif
#ifdef HAVE_OSX_KEYCHAIN #ifdef HAVE_OSX_KEYCHAIN
# if 0
/* FIXME The OSX part hasn't been tested yet */
#include <SecKeychain.h> #include <SecKeychain.h>
# endif /* 0 */
#endif #endif
/* This static indicates the debugging module that this .o belongs to. */ /* This static indicates the debugging module that this .o belongs to. */
@ -60,7 +63,7 @@ void gnc_keyring_set_password (const gchar *access_method,
} }
#endif /* HAVE_GNOME_KEYRING */ #endif /* HAVE_GNOME_KEYRING */
#ifdef HAVE_OSX_KEYCHAIN #ifdef HAVE_OSX_KEYCHAIN
# ifdef 0 # if 0
/* FIXME The OSX part hasn't been tested yet */ /* FIXME The OSX part hasn't been tested yet */
OSStatus status; OSStatus status;
SecKeychainItemRef *itemRef = NULL; SecKeychainItemRef *itemRef = NULL;
@ -113,7 +116,7 @@ gboolean gnc_keyring_get_password ( GtkWidget *parent,
GnomeKeyringNetworkPasswordData *found; GnomeKeyringNetworkPasswordData *found;
#endif #endif
#ifdef HAVE_OSX_KEYCHAIN #ifdef HAVE_OSX_KEYCHAIN
# ifdef 0 # if 0
/* FIXME The OSX part hasn't been tested yet */ /* FIXME The OSX part hasn't been tested yet */
void *password_data; void *password_data;
UInt32 password_length; UInt32 password_length;
@ -146,7 +149,7 @@ gboolean gnc_keyring_get_password ( GtkWidget *parent,
gnome_keyring_network_password_list_free(found_list); gnome_keyring_network_password_list_free(found_list);
#endif /* HAVE_GNOME_KEYRING */ #endif /* HAVE_GNOME_KEYRING */
#ifdef HAVE_OSX_KEYCHAIN #ifdef HAVE_OSX_KEYCHAIN
# ifdef 0 # if 0
/* FIXME The OSX part hasn't been tested yet */ /* FIXME The OSX part hasn't been tested yet */
void *password_data; void *password_data;
UInt32 password_length; UInt32 password_length;