[empathy/gnome-2-34] Support building with libgcr 3.0

[Stefan Walter <stefw src gnome org>]

commit 48c53fdb5bfcf801fc3f8eadf11340b97cae003b
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Mar 22 15:54:50 2011 +0100

    Support building with libgcr 3.0

 configure.ac                            |    3 +--
 libempathy-gtk/gcr-simple-certificate.c |    2 +-
 libempathy-gtk/gcr-simple-certificate.h |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0a1b6ef..69123b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,8 +221,7 @@ PKG_CHECK_MODULES(LIBNOTIFY,
 PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
 # gnome-keyring breaks API in 2.91.x
 PKG_CHECK_MODULES(GCR,
-    gcr-0 >= $KEYRING_REQUIRED
-    gcr-0 < 2.91)
+    gcr-0 >= $KEYRING_REQUIRED)
 
 # Enable GSEAL checks if needed
 if test "x$USE_MAINTAINER_MODE" = "xyes"; then
diff --git a/libempathy-gtk/gcr-simple-certificate.c b/libempathy-gtk/gcr-simple-certificate.c
index 072cbac..dab1eef 100644
--- a/libempathy-gtk/gcr-simple-certificate.c
+++ b/libempathy-gtk/gcr-simple-certificate.c
@@ -119,7 +119,7 @@ gcr_certificate_iface (GcrCertificateIface *iface)
  */
 
 GcrCertificate*
-gcr_simple_certificate_new (const guchar *data, gsize n_data)
+gcr_simple_certificate_new (gconstpointer data, gsize n_data)
 {
 	GcrSimpleCertificate *cert;
 	
diff --git a/libempathy-gtk/gcr-simple-certificate.h b/libempathy-gtk/gcr-simple-certificate.h
index ee46b48..83014db 100644
--- a/libempathy-gtk/gcr-simple-certificate.h
+++ b/libempathy-gtk/gcr-simple-certificate.h
@@ -53,7 +53,7 @@ struct _GcrSimpleCertificateClass {
 
 GType               gcr_simple_certificate_get_type               (void);
 
-GcrCertificate*     gcr_simple_certificate_new                    (const guchar *data,
+GcrCertificate*     gcr_simple_certificate_new                    (gconstpointer data,
                                                                    gsize n_data);
 
 G_END_DECLS