]>
Commit | Line | Data |
---|---|---|
cb0ba090 MB |
1 | --- evolution-3.1.92/configure.ac.wiget 2011-09-20 12:46:18.597079039 +0200 |
2 | +++ evolution-3.1.92/configure.ac 2011-09-20 12:46:56.003114171 +0200 | |
3 | @@ -50,7 +50,7 @@ m4_define([libpst_minimum_version], [0.6 | |
4 | m4_define([libnotify_minimum_version], [0.5.1]) | |
5 | ||
6 | dnl Optional Packages | |
7 | -m4_define([champlain_minimum_version], [0.10]) | |
8 | +m4_define([champlain_minimum_version], [0.12]) | |
9 | m4_define([clutter_gtk_minimum_version], [0.90]) | |
10 | m4_define([geoclue_minimum_version], [0.11.1]) | |
11 | m4_define([gladeui_minimum_version], [3.10.0]) | |
12 | @@ -1500,12 +1500,12 @@ if test "x$enable_contact_maps" = "xyes" | |
13 | AC_MSG_ERROR([Clutter is required for maps in contacts. Use --with-clutter=yes to enable clutter.]) | |
14 | fi | |
15 | ||
16 | - PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.10 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no]) | |
17 | + PKG_CHECK_MODULES([CHAMPLAIN], [champlain-gtk-0.12 >= champlain_minimum_version], [have_champlain=yes], [have_champlain=no]) | |
18 | AC_SUBST(CHAMPLAIN_CFLAGS) | |
19 | AC_SUBST(CHAMPLAIN_LIBS) | |
20 | ||
21 | if test "x$have_champlain" = "xno"; then | |
22 | - AC_MSG_ERROR([champlain-gtk-0.10 >= champlain_minimum_version is required for maps in contacts preview.]) | |
23 | + AC_MSG_ERROR([champlain-gtk-0.12 >= champlain_minimum_version is required for maps in contacts preview.]) | |
24 | fi | |
25 | ||
26 | PKG_CHECK_MODULES([GEOCLUE], [geoclue >= geoclue_minimum_version], [have_geoclue=yes], [have_geoclue=no]) | |
27 | --- evolution-3.1.92/widgets/misc/e-contact-map.c.wiget 2011-09-20 13:04:10.735525195 +0200 | |
28 | +++ evolution-3.1.92/widgets/misc/e-contact-map.c 2011-09-20 13:04:33.191856685 +0200 | |
29 | @@ -42,7 +42,7 @@ | |
30 | #include <glib/gi18n.h> | |
31 | #include <math.h> | |
32 | ||
33 | -G_DEFINE_TYPE (EContactMap, e_contact_map, GTK_TYPE_CHAMPLAIN_EMBED) | |
34 | +G_DEFINE_TYPE (EContactMap, e_contact_map, GTK_CHAMPLAIN_TYPE_EMBED) | |
35 | ||
36 | struct _EContactMapPrivate { | |
37 | GHashTable *markers; /* Hash table contact-name -> marker */ |