set tree to NULL if tree_view->priv->tree is NULL (#70152, patch by John

Fri Feb  1 20:50:29 2002  Kristian Rietveld  <kris@gtk.org>

        * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to
        NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper).

diff --git a/ChangeLog b/ChangeLog
index bf296ddbe5eacc734ee698dbd42a83faf812c205..8440e123745b5b3f1a2e9210b93f2922d9155478 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb  1 20:50:29 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to
+       NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper).
+
 Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (focus_child_in): Catch the

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index bf296ddbe5eacc734ee698dbd42a83faf812c205..8440e123745b5b3f1a2e9210b93f2922d9155478 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Fri Feb  1 20:50:29 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to
+       NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper).
+
 Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (focus_child_in): Catch the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bf296ddbe5eacc734ee698dbd42a83faf812c205..8440e123745b5b3f1a2e9210b93f2922d9155478 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Feb  1 20:50:29 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to
+       NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper).
+
 Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (focus_child_in): Catch the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bf296ddbe5eacc734ee698dbd42a83faf812c205..8440e123745b5b3f1a2e9210b93f2922d9155478 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Fri Feb  1 20:50:29 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to
+       NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper).
+
 Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (focus_child_in): Catch the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bf296ddbe5eacc734ee698dbd42a83faf812c205..8440e123745b5b3f1a2e9210b93f2922d9155478 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Feb  1 20:50:29 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to
+       NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper).
+
 Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (focus_child_in): Catch the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bf296ddbe5eacc734ee698dbd42a83faf812c205..8440e123745b5b3f1a2e9210b93f2922d9155478 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Feb  1 20:50:29 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to
+       NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper).
+
 Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (focus_child_in): Catch the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bf296ddbe5eacc734ee698dbd42a83faf812c205..8440e123745b5b3f1a2e9210b93f2922d9155478 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Feb  1 20:50:29 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_dy_to_top_row): set tree to
+       NULL if tree_view->priv->tree is NULL (#70152, patch by John Harper).
+
 Fri Feb  1 12:51:20 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtknotebook.c (focus_child_in): Catch the

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index b7b60cc50840ddb287339bf2104114018e33760c..5854332b20a5f408b38d73c323cc50d755a10c88 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3475,9 +3475,12 @@ gtk_tree_view_dy_to_top_row (GtkTreeView *tree_view)
   GtkRBNode *node;
 
   gtk_tree_row_reference_free (tree_view->priv->top_row);
-  tree_view->priv->top_row_dy = _gtk_rbtree_find_offset (tree_view->priv->tree,
-                                                        tree_view->priv->dy,
-                                                        &tree, &node);
+  if (tree_view->priv->tree == NULL)
+    tree = NULL;
+  else
+    tree_view->priv->top_row_dy = _gtk_rbtree_find_offset (tree_view->priv->tree,
+                                                          tree_view->priv->dy,
+                                                          &tree, &node);
   if (tree == NULL)
     {
       tree_view->priv->top_row = NULL;