Don't crash when there are no columns, or all columns are hidden, #131402

Fri Jan 23 14:56:18 2004  Jonathan Blandford  <jrb@gnome.org>

        * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Don't crash
        when there are no columns, or all columns are hidden, #131402

diff --git a/ChangeLog b/ChangeLog
index da042c01f2edf0fe6e6ea18434e36def42f5b9df..d37afcd8ada733c98d125fdff37cd1191d15ac51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 23 14:56:18 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Don't crash
+       when there are no columns, or all columns are hidden, #131402
+
 Fri Jan 23 16:58:28 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkmenu.c (DEFAULT_POPUP_DELAY): Changing to 200 was a

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index da042c01f2edf0fe6e6ea18434e36def42f5b9df..d37afcd8ada733c98d125fdff37cd1191d15ac51 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Fri Jan 23 14:56:18 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Don't crash
+       when there are no columns, or all columns are hidden, #131402
+
 Fri Jan 23 16:58:28 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkmenu.c (DEFAULT_POPUP_DELAY): Changing to 200 was a

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index da042c01f2edf0fe6e6ea18434e36def42f5b9df..d37afcd8ada733c98d125fdff37cd1191d15ac51 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Fri Jan 23 14:56:18 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Don't crash
+       when there are no columns, or all columns are hidden, #131402
+
 Fri Jan 23 16:58:28 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkmenu.c (DEFAULT_POPUP_DELAY): Changing to 200 was a

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index da042c01f2edf0fe6e6ea18434e36def42f5b9df..d37afcd8ada733c98d125fdff37cd1191d15ac51 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Fri Jan 23 14:56:18 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Don't crash
+       when there are no columns, or all columns are hidden, #131402
+
 Fri Jan 23 16:58:28 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkmenu.c (DEFAULT_POPUP_DELAY): Changing to 200 was a

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index da042c01f2edf0fe6e6ea18434e36def42f5b9df..d37afcd8ada733c98d125fdff37cd1191d15ac51 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Fri Jan 23 14:56:18 2004  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreeview.c (gtk_tree_view_get_path_at_pos): Don't crash
+       when there are no columns, or all columns are hidden, #131402
+
 Fri Jan 23 16:58:28 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtkmenu.c (DEFAULT_POPUP_DELAY): Changing to 200 was a

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index b3291d432d7462df6b80583324eea73cc2e248e0..271fc41b95a11b61c32851f5ec74d9ea31685e85 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -10620,14 +10620,24 @@ gtk_tree_view_get_path_at_pos (GtkTreeView        *tree_view,
          remaining_x -= tmp_column->width;
        }
 
+      /* If found is FALSE and there is a last_column, then it the remainder
+       * space is in that area
+       */
       if (!found)
         {
-          if (column)
-            *column = last_column;
-
-          if (cell_x)
-            *cell_x = last_column->width + remaining_x;
-        }
+         if (last_column)
+           {
+             if (column)
+               *column = last_column;
+             
+             if (cell_x)
+               *cell_x = last_column->width + remaining_x;
+           }
+         else
+           {
+             return FALSE;
+           }
+       }
     }
 
   y_offset = _gtk_rbtree_find_offset (tree_view->priv->tree,