[vino] Rename defines from gnome-keyring to secret

[David King <davidk src gnome org>]

commit 689cf6976aaf03ad895a66c77a40861c60bd7e0b
Author: David King <amigadave amigadave com>
Date:   Mon Aug 20 22:25:22 2012 +0100

    Rename defines from gnome-keyring to secret

 configure.ac         |   30 +++++++++++++++---------------
 server/vino-server.c |    4 ++--
 tools/vino-passwd.c  |    4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7dcdb36..3fb2a39 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,24 +116,24 @@ AS_IF([test "x$have_network_manager" = "xyes"],
     AS_IF([test "x$with_network_manager" = "xyes"],
     [AC_MSG_ERROR([NetworkManager support requested but not found])])])
 
-# Check for gnome-keyring
-LIBSECRET_DEPS="libsecret-1"
+# Check for secret
+SECRET_DEPS="libsecret-1"
 
-AC_ARG_WITH([gnome-keyring],
-  [AS_HELP_STRING([--without-gnome-keyring],
-    [ignore the presence of gnome-keyring and disable it])])
+AC_ARG_WITH([secret],
+  [AS_HELP_STRING([--without-secret],
+    [ignore the presence of secret and disable it])])
 
-AS_IF([test "x$with_gnome_keyring" != "xno"],
+AS_IF([test "x$with_secret" != "xno"],
   [PKG_CHECK_EXISTS([$LIBSECRET_DEPS],
-    [have_gnome_keyring=yes],
-    [have_gnome_keyring=no])],
-  [have_gnome_keyring=no])
-
-AS_IF([test "x$have_gnome_keyring" != "xno"],
-  [AC_DEFINE([VINO_HAVE_GNOME_KEYRING], [], [Build with gnome-keyring support])],
-  [LIBSECRET_DEPS=""
-    AS_IF([test "x$with_gnome_keyring" = "xyes"],
-    [AC_MSG_ERROR([gnome-keyring support requested but not found])])])
+    [have_secret=yes],
+    [have_secret=no])],
+  [have_secret=no])
+
+AS_IF([test "x$have_secret" != "xno"],
+  [AC_DEFINE([VINO_HAVE_SECRET], [], [Build with secret support])],
+  [SECRET_DEPS=""
+    AS_IF([test "x$with_secret" = "xyes"],
+    [AC_MSG_ERROR([secret support requested but not found])])])
 
 # Check for X11
 AC_PATH_XTRA
diff --git a/server/vino-server.c b/server/vino-server.c
index 5486bf1..b61b3b9 100644
--- a/server/vino-server.c
+++ b/server/vino-server.c
@@ -39,7 +39,7 @@
 #include <sys/poll.h>
 #include <gtk/gtk.h>
 
-#ifdef VINO_HAVE_GNOME_KEYRING
+#ifdef VINO_HAVE_SECRET
 #include <libsecret/secret.h>
 #endif
 
@@ -686,7 +686,7 @@ vino_server_defer_client_auth (VinoServer *server,
 static char *
 vino_server_get_password_from_keyring (VinoServer *server)
 {
-#ifdef VINO_HAVE_GNOME_KEYRING
+#ifdef VINO_HAVE_SECRET
   return secret_password_lookup_sync (SECRET_SCHEMA_COMPAT_NETWORK,
                                       NULL, NULL,
                                       "server", "vino.local",
diff --git a/tools/vino-passwd.c b/tools/vino-passwd.c
index 5ab6d15..3185200 100644
--- a/tools/vino-passwd.c
+++ b/tools/vino-passwd.c
@@ -37,7 +37,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-#ifdef VINO_HAVE_GNOME_KEYRING
+#ifdef VINO_HAVE_SECRET
 #include <libsecret/secret.h>
 #endif
 
@@ -48,7 +48,7 @@
 static gboolean
 vino_passwd_set_password_in_keyring (const char *password)
 {
-#ifdef VINO_HAVE_GNOME_KEYRING
+#ifdef VINO_HAVE_SECRET
   return secret_password_store_sync (SECRET_SCHEMA_COMPAT_NETWORK,
                                      SECRET_COLLECTION_DEFAULT,
                                      _("Remote desktop sharing password"),