[evolution] Bug 665980 - Bump minimum champlain-gtk version to 0.12
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Bug 665980 - Bump minimum champlain-gtk version to 0.12
- Date: Tue, 13 Dec 2011 14:44:47 +0000 (UTC)
commit 4b6cd5fef38cda89795ade523bcbcb8700cfbcdb
Author: Alban Browaeys <prahal yahoo com>
Date: Tue Dec 13 09:44:16 2011 -0500
Bug 665980 - Bump minimum champlain-gtk version to 0.12
configure.ac | 6 +++---
widgets/misc/e-contact-map.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 047ffee..1e538d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,7 @@ m4_define([libpst_minimum_version], [0.6.41])
m4_define([libnotify_minimum_version], [0.5.1])
dnl Optional Packages
-m4_define([champlain_minimum_version], [0.10])
+m4_define([champlain_minimum_version], [0.12])
m4_define([clutter_gtk_minimum_version], [0.90])
m4_define([geoclue_minimum_version], [0.11.1])
m4_define([gladeui_minimum_version], [3.10.0])
@@ -1425,12 +1425,12 @@ if test "x$enable_contact_maps" = "xyes"; then
AC_MSG_ERROR([Clutter is required for maps in contacts. Use --with-clutter=yes to enable clutter.])
fi
- PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.10 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no])
+ PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.12 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no])
AC_SUBST(CHAMPLAIN_CFLAGS)
AC_SUBST(CHAMPLAIN_LIBS)
if test "x$have_champlain" = "xno"; then
- AC_MSG_ERROR([champlain-gtk-0.10 >= champlain_minimum_version is required for maps in contacts preview.])
+ AC_MSG_ERROR([champlain-gtk-0.12 >= champlain_minimum_version is required for maps in contacts preview.])
fi
PKG_CHECK_MODULES([GEOCLUE], [geoclue >= geoclue_minimum_version], [have_geoclue=yes], [have_geoclue=no])
diff --git a/widgets/misc/e-contact-map.c b/widgets/misc/e-contact-map.c
index 500600d..ced6c91 100644
--- a/widgets/misc/e-contact-map.c
+++ b/widgets/misc/e-contact-map.c
@@ -42,7 +42,7 @@
#include <glib/gi18n.h>
#include <math.h>
-G_DEFINE_TYPE (EContactMap, e_contact_map, GTK_TYPE_CHAMPLAIN_EMBED)
+G_DEFINE_TYPE (EContactMap, e_contact_map, GTK_CHAMPLAIN_TYPE_EMBED)
struct _EContactMapPrivate {
GHashTable *markers; /* Hash table contact-name -> marker */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]