Don't crash if the displayed row is gone.

2004-08-02  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Don't
	crash if the displayed row is gone.

diff --git a/ChangeLog b/ChangeLog
index 68265e5977f311954b7859abb8714452a2523200..bf39d4514c76c152c63198a50bddd12a3695051c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Don't
+       crash if the displayed row is gone.
+
 2004-08-02  Morten Welinder  <terra@gnome.org>
 
        * gtk/gtkentry.c (gtk_entry_motion_notify): C99ism.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 68265e5977f311954b7859abb8714452a2523200..bf39d4514c76c152c63198a50bddd12a3695051c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-08-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Don't
+       crash if the displayed row is gone.
+
 2004-08-02  Morten Welinder  <terra@gnome.org>
 
        * gtk/gtkentry.c (gtk_entry_motion_notify): C99ism.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 68265e5977f311954b7859abb8714452a2523200..bf39d4514c76c152c63198a50bddd12a3695051c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-08-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Don't
+       crash if the displayed row is gone.
+
 2004-08-02  Morten Welinder  <terra@gnome.org>
 
        * gtk/gtkentry.c (gtk_entry_motion_notify): C99ism.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 68265e5977f311954b7859abb8714452a2523200..bf39d4514c76c152c63198a50bddd12a3695051c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-08-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellview.c (gtk_cell_view_set_cell_data): Don't
+       crash if the displayed row is gone.
+
 2004-08-02  Morten Welinder  <terra@gnome.org>
 
        * gtk/gtkentry.c (gtk_entry_motion_notify): C99ism.

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index cfa82d5de256ea682a430144322535c47e4a2ac5..880a41211079f7ee7c6b35e3a9767c8bbbdbc0e5 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -543,6 +543,9 @@ gtk_cell_view_set_cell_data (GtkCellView *cellview)
   g_return_if_fail (cellview->priv->displayed_row != NULL);
 
   path = gtk_tree_row_reference_get_path (cellview->priv->displayed_row);
+  if (!path)
+    return;
+
   gtk_tree_model_get_iter (cellview->priv->model, &iter, path);
   gtk_tree_path_free (path);