summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2004-08-25 20:06:29 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-08-25 20:06:29 +0000
commit58034d80e498037305d562c3ff25e60f7e50ed38 (patch)
tree93460f3eb2d10b3fc3c5adfb15ff5e03f35e703f
parentc1ce74bbc5190fa79cdef712f6f36d829e40e8ef (diff)
downloadgtk+-58034d80e498037305d562c3ff25e60f7e50ed38.tar.gz
Steal ATTACHED_MENUS list so its tail isn't freed when we re-set it,
2004-08-25 Matthias Clasen <mclasen@redhat.com> * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS list so its tail isn't freed when we re-set it, noticed by Hans Petter Jansson.
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-2-104
-rw-r--r--ChangeLog.pre-2-64
-rw-r--r--ChangeLog.pre-2-84
-rw-r--r--gtk/gtkmenu.c2
5 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 515cc25a7b..860346d4ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2004-08-25 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS
+ list so its tail isn't freed when we re-set it, noticed
+ by Hans Petter Jansson.
+
* gtk/gtksizegroup.c (gtk_size_group_add_widget): Fix
a typo, noticed by Tim Janik.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 515cc25a7b..860346d4ec 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,9 @@
2004-08-25 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS
+ list so its tail isn't freed when we re-set it, noticed
+ by Hans Petter Jansson.
+
* gtk/gtksizegroup.c (gtk_size_group_add_widget): Fix
a typo, noticed by Tim Janik.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 515cc25a7b..860346d4ec 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,9 @@
2004-08-25 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS
+ list so its tail isn't freed when we re-set it, noticed
+ by Hans Petter Jansson.
+
* gtk/gtksizegroup.c (gtk_size_group_add_widget): Fix
a typo, noticed by Tim Janik.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 515cc25a7b..860346d4ec 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,9 @@
2004-08-25 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkmenu.c (gtk_menu_attach_to_widget): Steal ATTACHED_MENUS
+ list so its tail isn't freed when we re-set it, noticed
+ by Hans Petter Jansson.
+
* gtk/gtksizegroup.c (gtk_size_group_add_widget): Fix
a typo, noticed by Tim Janik.
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 588e8a9ca3..d4be6416fd 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1037,7 +1037,7 @@ gtk_menu_attach_to_widget (GtkMenu *menu,
data->detacher = detacher;
g_object_set_data (G_OBJECT (menu), attach_data_key, data);
- list = g_object_get_data (G_OBJECT (attach_widget), ATTACHED_MENUS);
+ list = g_object_steal_data (G_OBJECT (attach_widget), ATTACHED_MENUS);
if (!g_list_find (list, menu))
{
list = g_list_prepend (list, menu);