[gnome-shell/gnome-3-38] Revert "st: Keep weak ref on texture cache bound texture source"
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gnome-3-38] Revert "st: Keep weak ref on texture cache bound texture source"
- Date: Mon, 15 Mar 2021 19:43:48 +0000 (UTC)
commit 0c23eb419da141e30d3e3ba436d6dd55a97b5334
Author: Sebastian Keller <skeller gnome org>
Date: Thu Feb 25 17:52:00 2021 +0100
Revert "st: Keep weak ref on texture cache bound texture source"
This reverts commit bdf31febed0d502f947ea621c3862bb4ac857933.
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1718>
src/st/st-texture-cache.c | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
---
diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c
index d913a2affe..d0e369b36a 100644
--- a/src/st/st-texture-cache.c
+++ b/src/st/st-texture-cache.c
@@ -797,10 +797,6 @@ st_texture_cache_bind_weak_notify (gpointer data,
{
StTextureCachePropertyBind *bind = data;
bind->weakref_active = FALSE;
- if (G_OBJECT (bind->image) != source_location)
- g_object_weak_unref (G_OBJECT (bind->image), st_texture_cache_bind_weak_notify, bind);
- if (bind->source != source_location)
- g_object_weak_unref (G_OBJECT (bind->source), st_texture_cache_bind_weak_notify, bind);
g_signal_handler_disconnect (bind->source, bind->notify_signal_id);
}
@@ -808,13 +804,8 @@ static void
st_texture_cache_free_bind (gpointer data)
{
StTextureCachePropertyBind *bind = data;
-
if (bind->weakref_active)
- {
- g_object_weak_unref (G_OBJECT (bind->image), st_texture_cache_bind_weak_notify, bind);
- g_object_weak_unref (G_OBJECT (bind->source), st_texture_cache_bind_weak_notify, bind);
- }
-
+ g_object_weak_unref (G_OBJECT (bind->image), st_texture_cache_bind_weak_notify, bind);
g_slice_free (StTextureCachePropertyBind, bind);
}
@@ -848,7 +839,6 @@ st_texture_cache_bind_cairo_surface_property (StTextureCache *cache,
st_texture_cache_reset_texture (bind, property_name);
g_object_weak_ref (G_OBJECT (bind->image), st_texture_cache_bind_weak_notify, bind);
- g_object_weak_ref (G_OBJECT (bind->source), st_texture_cache_bind_weak_notify, bind);
bind->weakref_active = TRUE;
notify_key = g_strdup_printf ("notify::%s", property_name);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]