[maemo-commits] [maemo-commits] r18801 - in projects/haf/trunk/clutter0.8: clutter/eglx debian

[From: subversion at stage.maemo.org]

Author: gw
Date: 2009-06-30 11:53:22 +0300 (Tue, 30 Jun 2009)
New Revision: 18801

Modified:
   projects/haf/trunk/clutter0.8/clutter/eglx/clutter-eglx-texture-pixmap.c
   projects/haf/trunk/clutter0.8/debian/changelog
Log:
  Gordon:
  Fixes: NB#118722 - Red bordered windows
  * clutter/x11/clutter-x11-texture-pixmap.c: Remove red-bordered warning 
    shape (we now render nothing if we were unable to get a texture).


Modified: projects/haf/trunk/clutter0.8/clutter/eglx/clutter-eglx-texture-pixmap.c
===================================================================
--- projects/haf/trunk/clutter0.8/clutter/eglx/clutter-eglx-texture-pixmap.c	2009-06-29 14:21:28 UTC (rev 18800)
+++ projects/haf/trunk/clutter0.8/clutter/eglx/clutter-eglx-texture-pixmap.c	2009-06-30 08:53:22 UTC (rev 18801)
@@ -42,8 +42,10 @@
  * The class requires the EGL_EXT_texture_from_pixmap OpenGL extension.
  */
 
+/* Whether to draw a red-bordered window when there is no valid pixmap
+ * (If we don't, we just draw nothing) */
+#define DEBUG_RED_RECT 0
 
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -658,6 +660,7 @@
   return actor;
 }
 
+#if DEBUG_RED_RECT
 static void
 clutter_eglx_texture_pixmap_paint_fail (ClutterActor *actor)
 {
@@ -681,6 +684,7 @@
   cogl_rectangle (0, 10, 10, h-20);
   cogl_rectangle (w-10, 10, 10, h-20);
 }
+#endif //DEBUG_RED_RECT
 
 void
 clutter_eglx_texture_pixmap_paint (ClutterActor *actor)
@@ -724,8 +728,9 @@
                name ? name : "null",
                pixmap, window, pixmap_width, pixmap_height, pixmap_depth);*/
 
-      /* No longer paint red fail rectangle - it just annoys users */
+#if DEBUG_RED_RECT
       clutter_eglx_texture_pixmap_paint_fail (actor);
+#endif //DEBUG_RED_RECT
       return;
     }
 

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-06-29 14:21:28 UTC (rev 18800)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-06-30 08:53:22 UTC (rev 18801)
@@ -1,8 +1,11 @@
 clutter (0.8.2-0maemo39~unreleased) unstable; urgency=low
 
-  * foo
+  Gordon:
+  Fixes: NB#118722 - Red bordered windows
+  * clutter/x11/clutter-x11-texture-pixmap.c: Remove red-bordered warning 
+    shape (we now render nothing if we were unable to get a texture).
 
- -- Aapo Kojo <aapo.kojo at nokia.com>  Fri, 26 Jun 2009 12:48:26 +0300
+ -- Gordon Williams <gordon.williams at collabora.co.uk>  Mon, 29 Jun 2009 09:36:00 +0100
 
 clutter (0.8.2-0maemo38) unstable; urgency=low