[gnome-keyring/gnome-3-0] Revert "Bump libtool version of gnome-keyring library for 3.0"



commit a894adc8a0790565130b094b7538562a30123d01
Author: Stef Walter <stefw collabora co uk>
Date:   Thu May 19 21:39:55 2011 +0200

    Revert "Bump libtool version of gnome-keyring library for 3.0"
    
    This reverts commit aebb7bf381694c3b72e456c2c1d19c0853d18836.
    
     * We also add back the deprecated symbol, and just leave it
       hanging around.

 configure.in      |    4 ++--
 gcr/gcr-library.c |    9 +++++++++
 gcr/gcr-types.h   |    8 ++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index 2732417..da9d310 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl ****************************************************************************
 dnl Library package and libtool versioning
 dnl
 dnl Updating the libtool versions, follow these instructions sequentially:
-dnl  1. If the library source code has changed at all since the last update, then increment revision ('c:r:a' becomes 'c:r+1:a').
+dnl  1. If the library source code has changed at all since the last update, then increment revision (â??c:r:aâ?? becomes â??c:r+1:aâ??).
 dnl  2. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
 dnl  3. If any interfaces have been added since the last public release, then increment age.
 dnl  4. If any interfaces have been removed or changed since the last public release, then set age to 0.
@@ -30,7 +30,7 @@ GCR_MINOR=0
 GCR_MICRO=0
 
 # GCR libtool versioning
-GCR_CURRENT=1
+GCR_CURRENT=0
 GCR_REVISION=0
 GCR_AGE=0
 
diff --git a/gcr/gcr-library.c b/gcr/gcr-library.c
index 0f338ed..9a3fdd0 100644
--- a/gcr/gcr-library.c
+++ b/gcr/gcr-library.c
@@ -82,6 +82,15 @@ gcr_data_error_get_domain (void)
 	return domain;
 }
 
+GQuark
+gcr_error_get_domain (void)
+{
+	static GQuark domain = 0;
+	if (domain == 0)
+		domain = g_quark_from_static_string ("gcr-error");
+	return domain;
+}
+
 /* -----------------------------------------------------------------------------
  * MEMORY
  */
diff --git a/gcr/gcr-types.h b/gcr/gcr-types.h
index ba6d85c..86b2e8c 100644
--- a/gcr/gcr-types.h
+++ b/gcr/gcr-types.h
@@ -47,6 +47,14 @@ G_BEGIN_DECLS
 
 GQuark 	            gcr_data_error_get_domain         (void) G_GNUC_CONST;
 
+#ifndef GCR_DISABLE_DEPRECATED
+
+#define             GCR_ERROR                         (gcr_error_get_domain ())
+
+GQuark              gcr_error_get_domain              (void) G_GNUC_CONST;
+
+#endif /* GCR_DISABLE_DEPRECATED */
+
 typedef enum {
 	GCR_ERROR_FAILURE = -1,
 	GCR_ERROR_UNRECOGNIZED = 1,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]