empathy-clutter-gtk-0.10.patch

   1 diff --git a/configure.ac b/configure.ac
   2 index 682f6a7..0088b4e 100644
   3 --- a/configure.ac
   4 +++ b/configure.ac
   5 @@ -37,7 +37,7 @@ LIBNOTIFY_REQUIRED=0.4.4
   6  LIBCANBERRA_GTK_REQUIRED=0.4
   7  LIBCHAMPLAIN_REQUIRED=0.3.3
   8  LIBCHAMPLAIN_GTK_REQUIRED=0.3.3
   9 -CLUTTER_GTK_REQUIRED=0.8.2
  10 +CLUTTER_GTK_REQUIRED=0.10.0
  11  GEOCLUE_REQUIRED=0.11
  12  WEBKIT_REQUIRED=1.1.7
  13  NETWORK_MANAGER_REQUIRED=0.7.0
  14 @@ -259,7 +259,7 @@ if test "x$enable_map" != "xno"; then
  15     [
  16        champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
  17        champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
  18 -      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
  19 +      clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
  20     ], have_libchamplain="yes", have_libchamplain="no")
  21
  22     if test "x$have_libchamplain" = "xyes"; then
  23 diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c
  24 index 86e15bd..3bcc5f3 100644
  25 --- a/src/empathy-map-view.c
  26 +++ b/src/empathy-map-view.c
  27 @@ -26,7 +26,7 @@
  28
  29  #include <champlain/champlain.h>
  30  #include <champlain-gtk/champlain-gtk.h>
  31 -#include <clutter-gtk/gtk-clutter-embed.h>
  32 +#include <clutter-gtk/clutter-gtk.h>
  33  #include <telepathy-glib/util.h>
  34
  35  #include <libempathy/empathy-contact.h>
  36 @@ -190,7 +190,7 @@ map_view_contacts_foreach (GtkTreeModel *model,
  37    if (avatar != NULL)
  38      {
  39        texture = clutter_texture_new ();
  40 -      gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar);
  41 +      gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar, NULL);
  42        champlain_marker_set_image (CHAMPLAIN_MARKER (marker), texture);
  43        g_object_unref (avatar);
  44      }
  45 diff --git a/src/empathy.c b/src/empathy.c
  46 index 4ff0918..15155d2 100644
  47 --- a/src/empathy.c
  48 +++ b/src/empathy.c
  49 @@ -32,7 +32,7 @@
  50  #include <gdk/gdkx.h>
  51
  52  #if HAVE_LIBCHAMPLAIN
  53 -#include <clutter-gtk/gtk-clutter-embed.h>
  54 +#include <clutter-gtk/clutter-gtk.h>
  55  #endif
  56
  57  #include <libebook/e-book.h>