aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>2009-08-04 10:58:08 +0800
committerPierre-Luc Beaudoin <pierre-luc.beaudoin@collabora.co.uk>2009-08-18 01:22:36 +0800
commit3e59547e23fbd7d91f5b96ffc52270084dce5b79 (patch)
tree5ea34350a0c55b895dc1944e42b199aaebbc45ab
parent8a384ab9928c7d1a460b0233036edaa86010b444 (diff)
downloadgsoc2013-empathy-3e59547e23fbd7d91f5b96ffc52270084dce5b79.tar
gsoc2013-empathy-3e59547e23fbd7d91f5b96ffc52270084dce5b79.tar.gz
gsoc2013-empathy-3e59547e23fbd7d91f5b96ffc52270084dce5b79.tar.bz2
gsoc2013-empathy-3e59547e23fbd7d91f5b96ffc52270084dce5b79.tar.lz
gsoc2013-empathy-3e59547e23fbd7d91f5b96ffc52270084dce5b79.tar.xz
gsoc2013-empathy-3e59547e23fbd7d91f5b96ffc52270084dce5b79.tar.zst
gsoc2013-empathy-3e59547e23fbd7d91f5b96ffc52270084dce5b79.zip
Port to Clutter 1.0 and libchamplain 0.3.6
-rw-r--r--configure.ac8
-rw-r--r--src/empathy-map-view.c5
-rw-r--r--src/empathy.c2
3 files changed, 8 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 7b40c74aa..3484e3cd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,9 +35,9 @@ ENCHANT_REQUIRED=1.2.0
ISO_CODES_REQUIRED=0.35
LIBNOTIFY_REQUIRED=0.4.4
LIBCANBERRA_GTK_REQUIRED=0.4
-LIBCHAMPLAIN_REQUIRED=0.3.3
-LIBCHAMPLAIN_GTK_REQUIRED=0.3.3
-CLUTTER_GTK_REQUIRED=0.8.2
+LIBCHAMPLAIN_REQUIRED=0.3.6
+LIBCHAMPLAIN_GTK_REQUIRED=0.3.6
+CLUTTER_GTK_REQUIRED=0.10
GEOCLUE_REQUIRED=0.11
WEBKIT_REQUIRED=1.1.7
NETWORK_MANAGER_REQUIRED=0.7.0
@@ -259,7 +259,7 @@ if test "x$enable_map" != "xno"; then
[
champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
- clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
+ clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
], have_libchamplain="yes", have_libchamplain="no")
if test "x$have_libchamplain" = "xyes"; then
diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c
index 86e15bdff..e4800adc1 100644
--- a/src/empathy-map-view.c
+++ b/src/empathy-map-view.c
@@ -26,7 +26,7 @@
#include <champlain/champlain.h>
#include <champlain-gtk/champlain-gtk.h>
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
#include <telepathy-glib/util.h>
#include <libempathy/empathy-contact.h>
@@ -190,7 +190,8 @@ map_view_contacts_foreach (GtkTreeModel *model,
if (avatar != NULL)
{
texture = clutter_texture_new ();
- gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar);
+ gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar,
+ NULL);
champlain_marker_set_image (CHAMPLAIN_MARKER (marker), texture);
g_object_unref (avatar);
}
diff --git a/src/empathy.c b/src/empathy.c
index 4ff0918fd..15155d28d 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -32,7 +32,7 @@
#include <gdk/gdkx.h>
#if HAVE_LIBCHAMPLAIN
-#include <clutter-gtk/gtk-clutter-embed.h>
+#include <clutter-gtk/clutter-gtk.h>
#endif
#include <libebook/e-book.h>