Mailing List Archive

Author: kihamala
Date: 2009-10-07 15:07:09 +0300 (Wed, 07 Oct 2009)
New Revision: 19422

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


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-10-07 10:30:24 UTC (rev 19421)
+++ projects/haf/trunk/clutter0.8/clutter/eglx/clutter-eglx-texture-pixmap.c 2009-10-07 12:07:09 UTC (rev 19422)
@@ -95,8 +95,6 @@

/* If the pixmap has changed, we'll want to try and recreate the surface */
gboolean pixmap_changed;
-
- gboolean dispose_called;
};

void
@@ -182,7 +180,6 @@
priv->current_pixmap_depth = 0;
priv->current_pixmap_width = 0;
priv->current_pixmap_height = 0;
- priv->dispose_called = FALSE;

if (_ext_check_done == FALSE)
{
@@ -214,23 +211,10 @@

priv = CLUTTER_EGLX_TEXTURE_PIXMAP (object)->priv;

- /* this dispose handler is called twice because of how
- * clutter_actor_destroy works */
- if (priv->dispose_called)
- return;
-
if (priv->egl_surface != EGL_NO_SURFACE)
clutter_eglx_texture_pixmap_surface_destroy(CLUTTER_ACTOR(object));

- if (priv->texture_id)
- {
- glDeleteTextures (1, &priv->texture_id);
- priv->texture_id = 0;
- }
-
G_OBJECT_CLASS (clutter_eglx_texture_pixmap_parent_class)->dispose (object);
-
- priv->dispose_called = TRUE;
}

static gboolean
@@ -378,7 +362,6 @@
g_debug ("%s: Unable to create cogl texture", __FUNCTION__);

glDeleteTextures (1, &priv->texture_id);
- priv->texture_id = 0;

CLUTTER_NOTE (TEXTURE, "Falling back to X11 manual mechanism");
priv->use_fallback = TRUE;

Modified: projects/haf/trunk/clutter0.8/debian/changelog
===================================================================
--- projects/haf/trunk/clutter0.8/debian/changelog 2009-10-07 10:30:24 UTC (rev 19421)
+++ projects/haf/trunk/clutter0.8/debian/changelog 2009-10-07 12:07:09 UTC (rev 19422)
@@ -1,6 +1,6 @@
-clutter (0.8.2-0maemo53~unreleased) unstable; urgency=low
+clutter (0.8.2-0maemo53) unstable; urgency=low

- * foo
+ * Revert fix for NB#134230 because fix for NB#139960 was reverted.

-- Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> Tue, 7 Oct 2009 14:01:27 +0300

@@ -23,7 +23,7 @@
* clutter/eglx/clutter-eglx-texture-pixmap.c
(clutter_eglx_texture_pixmap_dispose): Delete the texture to avoid a
memory leak.
- Fixes: NB#134230 - Memory leak in hildon-desktop when starting and closing
+ NB#134230 - Memory leak in hildon-desktop when starting and closing
Media Player

-- Kimmo Hämäläinen <kimmo.hamalainen@nokia.com> Tue, 06 Oct 2009 08:59:02 +0300

_______________________________________________
maemo-commits mailing list
maemo-commits@maemo.org
https://lists.maemo.org/mailman/listinfo/maemo-commits