summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2007-07-31 03:00:18 +0000
committerRay Strode <halfline@src.gnome.org>2007-07-31 03:00:18 +0000
commit2537efdcb335ef127bbf4d84f4c5ee6f5e29d256 (patch)
treed8426d729c0f350b8242c02990630fbf220fae58
parente398f2e4122be8b29a1eeaa941c3ac631c6bf790 (diff)
downloadlibwnck-gnome-2-18.tar.gz
remove weak pointers on fields in task structure before freeing task blockgnome-2-18
2007-07-30 Ray Strode <rstrode@redhat.com> * libwnck/tasklist.c (wnck_task_finalize): remove weak pointers on fields in task structure before freeing task block (bug 139080) svn path=/branches/gnome-2-18/; revision=1425
-rw-r--r--ChangeLog6
-rw-r--r--libwnck/tasklist.c4
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 52dfa7c..5d6d07b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-30 Ray Strode <rstrode@redhat.com>
+
+ * libwnck/tasklist.c (wnck_task_finalize): remove weak
+ pointers on fields in task structure before freeing task
+ block (bug 139080)
+
2007-07-02 Vincent Untz <vuntz@gnome.org>
* configure.in: post-release bump to 2.18.4
diff --git a/libwnck/tasklist.c b/libwnck/tasklist.c
index 386bb29..951f5cc 100644
--- a/libwnck/tasklist.c
+++ b/libwnck/tasklist.c
@@ -492,6 +492,8 @@ wnck_task_finalize (GObject *object)
if (task->button)
{
+ g_object_remove_weak_pointer (G_OBJECT (task->button),
+ (void**) &task->button);
gtk_widget_destroy (task->button);
task->button = NULL;
}
@@ -542,6 +544,8 @@ wnck_task_finalize (GObject *object)
if (task->action_menu)
{
+ g_object_remove_weak_pointer (G_OBJECT (task->action_menu),
+ (void**) &task->action_menu);
g_object_unref (task->action_menu);
task->action_menu = NULL;
}