summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2004-07-30 22:55:28 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-07-30 22:55:28 +0000
commitf56daaf167aa1da11e53f2d7be5d6df8bfaaac71 (patch)
treef10adf6e691e6499ce0139a89f8dbd309c2b9fc3
parent1f93c4359cee608ffd2914ae6ff6c5635bdce737 (diff)
downloadgdk-pixbuf-f56daaf167aa1da11e53f2d7be5d6df8bfaaac71.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtkcombobox.c7
5 files changed, 27 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e260f9144..d118a770e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2004-07-30 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkcombobox.c: Don't forget to destroy the row separator
+ function user data when the combo box is destroyed.
+
+2004-07-30 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkcombobox.h:
* gtk/gtkcombobox.c: Change the api for separators to use a
separator function instead of a boolean column.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e260f9144..d118a770e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
2004-07-30 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkcombobox.c: Don't forget to destroy the row separator
+ function user data when the combo box is destroyed.
+
+2004-07-30 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkcombobox.h:
* gtk/gtkcombobox.c: Change the api for separators to use a
separator function instead of a boolean column.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e260f9144..d118a770e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,10 @@
2004-07-30 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkcombobox.c: Don't forget to destroy the row separator
+ function user data when the combo box is destroyed.
+
+2004-07-30 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkcombobox.h:
* gtk/gtkcombobox.c: Change the api for separators to use a
separator function instead of a boolean column.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e260f9144..d118a770e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,10 @@
2004-07-30 Matthias Clasen <mclasen@redhat.com>
+ * gtk/gtkcombobox.c: Don't forget to destroy the row separator
+ function user data when the combo box is destroyed.
+
+2004-07-30 Matthias Clasen <mclasen@redhat.com>
+
* gtk/gtkcombobox.h:
* gtk/gtkcombobox.c: Change the api for separators to use a
separator function instead of a boolean column.
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index bfae4b0e7..1b0dc441d 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4120,6 +4120,13 @@ gtk_combo_box_destroy (GtkObject *object)
gtk_combo_box_popdown (combo_box);
+ if (combo_box->priv->row_separator_destroy)
+ (* combo_box->priv->row_separator_destroy) (combo_box->priv->row_separator_data);
+
+ combo_box->priv->row_separator_func = NULL;
+ combo_box->priv->row_separator_data = NULL;
+ combo_box->priv->row_separator_destroy = NULL;
+
combo_box->priv->destroying = 1;
GTK_OBJECT_CLASS (parent_class)->destroy (object);