Protect against tree_view being NULL. (#348652, Patrick K. O'Brian, Chris

2006-08-05  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_reorder):
	Protect against tree_view being NULL.  (#348652, Patrick K. O'Brian,
	Chris Wilson)

diff --git a/ChangeLog b/ChangeLog
index 580a771555f84bdaf8b7a278ca8ed79065b559b9..5073323281deb25efe9d1e813a684c0b877b8418 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_reorder): 
+       Protect against tree_view being NULL.  (#348652, Patrick K. O'Brian,
+       Chris Wilson)
+
 2006-08-03  Emmanuele Bassi  <ebassi@gnome.org>
 
        * gtk/gtkrecentchoosermenu.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 580a771555f84bdaf8b7a278ca8ed79065b559b9..5073323281deb25efe9d1e813a684c0b877b8418 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-08-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_layout_reorder): 
+       Protect against tree_view being NULL.  (#348652, Patrick K. O'Brian,
+       Chris Wilson)
+
 2006-08-03  Emmanuele Bassi  <ebassi@gnome.org>
 
        * gtk/gtkrecentchoosermenu.c:

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 1b22478f2197907b2163da985ecdfc7ec2cfd1ab..b5e657e0aadbbc8b2b2c5d78f5a1fa6dedb5c473 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -750,7 +750,8 @@ gtk_tree_view_column_cell_layout_reorder (GtkCellLayout   *cell_layout,
   column->cell_list = g_list_remove_link (column->cell_list, link);
   column->cell_list = g_list_insert (column->cell_list, info, position);
 
-  gtk_widget_queue_draw (column->tree_view);
+  if (column->tree_view)
+    gtk_widget_queue_draw (column->tree_view);
 }
 
 static void