summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.pre-2-04
-rw-r--r--ChangeLog.pre-2-104
-rw-r--r--ChangeLog.pre-2-24
-rw-r--r--ChangeLog.pre-2-44
-rw-r--r--ChangeLog.pre-2-64
-rw-r--r--ChangeLog.pre-2-84
-rw-r--r--gtk/gtktreedatalist.c4
-rw-r--r--gtk/gtktreeview.h1
9 files changed, 31 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eb1bd055b0..8c37fbf87d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Nov 15 18:44:33 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreedatalist.c (_gtk_tree_data_list_free): maybe fix #64160
+
2001-11-15 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkwindow.c (gtk_window_new): Move '.' out of quote. (#64407)
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index eb1bd055b0..8c37fbf87d 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+Thu Nov 15 18:44:33 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreedatalist.c (_gtk_tree_data_list_free): maybe fix #64160
+
2001-11-15 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkwindow.c (gtk_window_new): Move '.' out of quote. (#64407)
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index eb1bd055b0..8c37fbf87d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+Thu Nov 15 18:44:33 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreedatalist.c (_gtk_tree_data_list_free): maybe fix #64160
+
2001-11-15 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkwindow.c (gtk_window_new): Move '.' out of quote. (#64407)
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index eb1bd055b0..8c37fbf87d 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+Thu Nov 15 18:44:33 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreedatalist.c (_gtk_tree_data_list_free): maybe fix #64160
+
2001-11-15 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkwindow.c (gtk_window_new): Move '.' out of quote. (#64407)
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index eb1bd055b0..8c37fbf87d 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+Thu Nov 15 18:44:33 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreedatalist.c (_gtk_tree_data_list_free): maybe fix #64160
+
2001-11-15 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkwindow.c (gtk_window_new): Move '.' out of quote. (#64407)
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index eb1bd055b0..8c37fbf87d 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+Thu Nov 15 18:44:33 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreedatalist.c (_gtk_tree_data_list_free): maybe fix #64160
+
2001-11-15 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkwindow.c (gtk_window_new): Move '.' out of quote. (#64407)
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index eb1bd055b0..8c37fbf87d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+Thu Nov 15 18:44:33 2001 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreedatalist.c (_gtk_tree_data_list_free): maybe fix #64160
+
2001-11-15 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkwindow.c (gtk_window_new): Move '.' out of quote. (#64407)
diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c
index a34ec37bf9..d47874cfe9 100644
--- a/gtk/gtktreedatalist.c
+++ b/gtk/gtktreedatalist.c
@@ -58,9 +58,9 @@ _gtk_tree_data_list_free (GtkTreeDataList *list,
next = tmp->next;
if (g_type_is_a (column_headers [i], G_TYPE_STRING))
g_free ((gchar *) tmp->data.v_pointer);
- else if (g_type_is_a (column_headers [i], G_TYPE_OBJECT))
+ else if (g_type_is_a (column_headers [i], G_TYPE_OBJECT) && tmp->data.v_pointer != NULL)
g_object_unref (G_OBJECT (tmp->data.v_pointer));
- else if (g_type_is_a (column_headers [i], G_TYPE_BOXED))
+ else if (g_type_is_a (column_headers [i], G_TYPE_BOXED) && tmp->data.v_pointer != NULL)
g_boxed_free (column_headers [i], (gpointer) tmp->data.v_pointer);
g_mem_chunk_free (tree_chunk, tmp);
diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 5e132658dc..e8ada6f196 100644
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -216,6 +216,7 @@ void gtk_tree_view_get_cursor (GtkTreeView
/* Layout information */
+GdkWindow *gtk_tree_view_get_bin_window (GtkTreeView *tree_view);
gboolean gtk_tree_view_get_path_at_pos (GtkTreeView *tree_view,
gint x,
gint y,