diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-03-22 22:54:50 +0800 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-03-22 23:00:18 +0800 |
| commit | 48c53fdb5bfcf801fc3f8eadf11340b97cae003b (patch) | |
| tree | 7020beca98216a633ea9bc2055106368ac0b7009 | |
| parent | 8b18f92aedef75ae557e879ddc4a60ce833d50d3 (diff) | |
| download | gsoc2013-empathy-48c53fdb5bfcf801fc3f8eadf11340b97cae003b.tar gsoc2013-empathy-48c53fdb5bfcf801fc3f8eadf11340b97cae003b.tar.gz gsoc2013-empathy-48c53fdb5bfcf801fc3f8eadf11340b97cae003b.tar.bz2 gsoc2013-empathy-48c53fdb5bfcf801fc3f8eadf11340b97cae003b.tar.lz gsoc2013-empathy-48c53fdb5bfcf801fc3f8eadf11340b97cae003b.tar.xz gsoc2013-empathy-48c53fdb5bfcf801fc3f8eadf11340b97cae003b.tar.zst gsoc2013-empathy-48c53fdb5bfcf801fc3f8eadf11340b97cae003b.zip | |
Support building with libgcr 3.0
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libempathy-gtk/gcr-simple-certificate.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/gcr-simple-certificate.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 0a1b6ef56..69123b90f 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 072cbac97..dab1eef4d 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 ee46b4817..83014db6e 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 |