Don't do anything beyond clearing to the background if there is no active

Sat Mar 13 21:47:47 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything
	beyond clearing to the background if there is no active row.
	(#137066, reported by Owen Taylor)

diff --git a/ChangeLog b/ChangeLog
index 85a440b9eb828ac164847fd443a7c3de62536b22..486506e65920d4b8784cf6d182f304c2dba42fb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Mar 13 21:47:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything
+       beyond clearing to the background if there is no active row.
+       (#137066, reported by Owen Taylor)
+
 Sat Mar 13 21:37:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_list_key_press): Pop down the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 85a440b9eb828ac164847fd443a7c3de62536b22..486506e65920d4b8784cf6d182f304c2dba42fb0 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Mar 13 21:47:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything
+       beyond clearing to the background if there is no active row.
+       (#137066, reported by Owen Taylor)
+
 Sat Mar 13 21:37:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_list_key_press): Pop down the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 85a440b9eb828ac164847fd443a7c3de62536b22..486506e65920d4b8784cf6d182f304c2dba42fb0 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Mar 13 21:47:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything
+       beyond clearing to the background if there is no active row.
+       (#137066, reported by Owen Taylor)
+
 Sat Mar 13 21:37:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_list_key_press): Pop down the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 85a440b9eb828ac164847fd443a7c3de62536b22..486506e65920d4b8784cf6d182f304c2dba42fb0 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Mar 13 21:47:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything
+       beyond clearing to the background if there is no active row.
+       (#137066, reported by Owen Taylor)
+
 Sat Mar 13 21:37:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_list_key_press): Pop down the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 85a440b9eb828ac164847fd443a7c3de62536b22..486506e65920d4b8784cf6d182f304c2dba42fb0 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Mar 13 21:47:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything
+       beyond clearing to the background if there is no active row.
+       (#137066, reported by Owen Taylor)
+
 Sat Mar 13 21:37:44 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcombobox.c (gtk_combo_box_list_key_press): Pop down the

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 5f8465a8039fd264a876c48f51fece56b0ce6ade..c0efb0c1b345d0031073c8bbc775cff6f25034ce 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -437,9 +437,11 @@ gtk_cell_view_expose (GtkWidget      *widget,
       g_object_unref (G_OBJECT (gc));
     }
 
-  /* set cell data (if applicable) */
-  if (cellview->priv->displayed_row)
-    gtk_cell_view_set_cell_data (cellview);
+  if (!cellview->priv->displayed_row)
+    return FALSE;
+    
+  /* set cell data */
+  gtk_cell_view_set_cell_data (cellview);
 
   /* render cells */
   area = widget->allocation;