[libgnome-keyring] Fix deprecated declarations for gnome-keyring-memory.h

[Stefan Walter <stefw src gnome org>]

commit c7ddd5666dab0b7c31347ed38fb3d5053f930faa
Author: Stef Walter <stefw gnome org>
Date:   Thu Mar 20 13:40:51 2014 +0100

    Fix deprecated declarations for gnome-keyring-memory.h

 library/gnome-keyring-memory.h |    6 ++++--
 library/gnome-keyring.h        |    2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/library/gnome-keyring-memory.h b/library/gnome-keyring-memory.h
index c0ba15d..972bf20 100644
--- a/library/gnome-keyring-memory.h
+++ b/library/gnome-keyring-memory.h
@@ -26,13 +26,15 @@
 
 #include <glib.h>
 
+#if !defined(GNOME_KEYRING_DEPRECATED)
 #if !defined(GNOME_KEYRING_COMPILATION) && defined(G_DEPRECATED)
-#define GNOME_KEYRING_DEPRECATED GNOME_KEYRING_DEPRECATED
-#define GNOME_KEYRING_DEPRECATED_FOR(x) GNOME_KEYRING_DEPRECATED(x)
+#define GNOME_KEYRING_DEPRECATED G_DEPRECATED
+#define GNOME_KEYRING_DEPRECATED_FOR(x) G_DEPRECATED_FOR(x)
 #else
 #define GNOME_KEYRING_DEPRECATED
 #define GNOME_KEYRING_DEPRECATED_FOR(x)
 #endif
+#endif
 
 G_BEGIN_DECLS
 
diff --git a/library/gnome-keyring.h b/library/gnome-keyring.h
index 7b54d7d..f347d81 100644
--- a/library/gnome-keyring.h
+++ b/library/gnome-keyring.h
@@ -28,6 +28,7 @@
 #include <glib-object.h>
 #include <time.h>
 
+#if !defined(GNOME_KEYRING_DEPRECATED)
 #if !defined(GNOME_KEYRING_COMPILATION) && defined(G_DEPRECATED)
 #define GNOME_KEYRING_DEPRECATED G_DEPRECATED
 #define GNOME_KEYRING_DEPRECATED_FOR(x) G_DEPRECATED_FOR(x)
@@ -35,6 +36,7 @@
 #define GNOME_KEYRING_DEPRECATED
 #define GNOME_KEYRING_DEPRECATED_FOR(x)
 #endif
+#endif
 
 #include "gnome-keyring-result.h"