File clutter-gtk-no-deprecated.patch of Package clutter-gtk

Overview Repositories Revisions Requests Users Attributes Meta

File clutter-gtk-no-deprecated.patch of Package clutter-gtk (Revision fc5be213fe69b51a0c553f6eabf75896)

Currently displaying revision fc5be213fe69b51a0c553f6eabf75896 , Show latest

From fa2b4e338ce9c084c8b7a12e81cd6782c22f0473 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Fri, 08  Jan  2010  15:29:11  +0000
Subject: Use 1.1.5 API for ARGB visuals on X11

Commit 5157da9fc of clutter/master reworked the ARGB visual API; it also
deprecated clutter_x11_get_stage_visual(), which always was a dubiously
named function, in favour of clutter_x11_get_visual_info().

For this reason we should conditionally use the 1.1.5 API, if we are
compiled against it.
---
diff --git a/clutter-gtk/gtk-clutter-embed.c b/clutter-gtk/gtk-clutter-embed.c
index c7d271c..6aec960 100644
--- a/clutter-gtk/gtk-clutter-embed.c
+++ b/clutter-gtk/gtk-clutter-embed.c
@@ -193,8 +193,13 @@ gtk_clutter_embed_realize (GtkWidget *widget)
     GdkVisual *visual;
     GdkColormap *colormap;
 
+# if CLUTTER_CHECK_VERSION (1, 1, 5)
     /* We need to use the colormap from the Clutter visual */
+    xvinfo = clutter_x11_get_visual_info ();
+# else
     xvinfo = clutter_x11_get_stage_visual (CLUTTER_STAGE (priv->stage));
+# endif
+
     if (xvinfo == None)
       {
         g_critical ("Unable to retrieve the XVisualInfo from Clutter");
diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c
index 7279f7d..4668404 100644
--- a/clutter-gtk/gtk-clutter-util.c
+++ b/clutter-gtk/gtk-clutter-util.c
@@ -623,9 +623,18 @@ gtk_clutter_init (int    *argc,
     return CLUTTER_INIT_ERROR_GTK;
 
 #if defined(HAVE_CLUTTER_GTK_X11)
+# if CLUTTER_CHECK_VERSION (1, 1, 5)
+  /* enable ARGB visuals by default for Clutter */
+  clutter_x11_set_use_argb_visual (TRUE);
+# endif
+
+  /* share the X11 Display with GTK+ */
   clutter_x11_set_display (GDK_DISPLAY());
+
+  /* let GTK+ in charge of the event handling */
   clutter_x11_disable_event_retrieval ();
 #elif defined(HAVE_CLUTTER_GTK_WIN32)
+  /* let GTK+ in charge of the event handling */
   clutter_win32_disable_event_retrieval ();
 #endif /* HAVE_CLUTTER_GTK_{X11,WIN32} */
 
@@ -687,9 +696,19 @@ gtk_clutter_init_with_args (int            *argc,
     return CLUTTER_INIT_ERROR_GTK;
 
 #if defined(GDK_WINDOWING_X11)
+
+# if CLUTTER_CHECK_VERSION (1, 1, 5)
+  /* enable ARGB visuals by default for Clutter */
+  clutter_x11_set_use_argb_visual (TRUE);
+# endif
+
+  /* share the X11 Display with GTK+ */
   clutter_x11_set_display (GDK_DISPLAY());
+
+  /* let GTK+ in charge of the event handling */
   clutter_x11_disable_event_retrieval ();
 #elif defined(GDK_WINDOWING_WIN32)
+  /* let GTK+ in charge of the event handling */
   clutter_win32_disable_event_retrieval ();
 #endif /* GDK_WINDOWING_{X11,WIN32} */
 
--
cgit v0.7.2-85-gd188

Places

File clutter-gtk-no-deprecated.patch of Package clutter-gtk (Revision fc5be213fe69b51a0c553f6eabf75896)

Places