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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-09-18 14:52:49 +0300 (Fri, 18 Sep 2009)
New Revision: 19371

Modified:
   projects/haf/trunk/clutter0.8/clutter/eglx/clutter-eglx-texture-pixmap.c
   projects/haf/trunk/clutter0.8/debian/changelog
Log:

  * clutter/eglx/clutter-eglx-texture-pixmap.c (create_cogl_texture): Unref
    the cogl texture because clutter_texture_set_cogl_texture already
    references it for its own purposes. Related to NB#134230 and NB#98132



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-09-18 11:18:41 UTC (rev 19370)
+++ projects/haf/trunk/clutter0.8/clutter/eglx/clutter-eglx-texture-pixmap.c	2009-09-18 11:52:49 UTC (rev 19371)
@@ -234,6 +234,8 @@
     {
       /*g_debug ("%s: created cogl handle %x", __FUNCTION__, (int)handle);*/
       clutter_texture_set_cogl_texture (texture, handle);
+      /* unref because clutter_texture_set_cogl_texture ref'd the handle */
+      cogl_texture_unref (handle);
       return TRUE;
     }
   else

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog	2009-09-18 11:18:41 UTC (rev 19370)
+++ projects/haf/trunk/clutter0.8/debian/changelog	2009-09-18 11:52:49 UTC (rev 19371)
@@ -1,6 +1,9 @@
 clutter (0.8.2-0maemo50~unreleased) unstable; urgency=low
 
-  * foo
+  Kimmo:
+  * clutter/eglx/clutter-eglx-texture-pixmap.c (create_cogl_texture): Unref
+    the cogl texture because clutter_texture_set_cogl_texture already
+    references it for its own purposes. Related to NB#134230 and NB#98132
   
  -- Gordon Williams <gordon.williams at collabora.co.uk>  Tue,  7 Sep 2009 14:34:14 +0100