fix silly bug reported by "Padraig O'Briain" <Padraig.Obriain@Sun.COM>.

Wed Jun  6 19:31:11 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_set_model): fix silly bug
	reported by "Padraig O'Briain" <Padraig.Obriain@Sun.COM>.

diff --git a/ChangeLog b/ChangeLog
index 891b8745406c5693c79e34b29be35a6b94942ee5..085569bc8c8883e5fff653beae4f39c2c0d60d82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun  6 19:31:11 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): fix silly bug
+       reported by "Padraig O'Briain" <Padraig.Obriain@Sun.COM>.
+
 Wed Jun  6 20:01:38 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c
@@ -816,7 +821,7 @@ Wed May  9 15:27:22 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_key_press): Cancel drags if
        Escape is pressed.
 
-Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@webwynk.net>
+Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_class_init): New
        "columns_changed" signal.
@@ -1022,7 +1027,7 @@ Wed May  2 17:26:22 2001  Owen Taylor  <otaylor@redhat.com>
        no way of knowing reliably whether we are viewable or
        not. (#53947)
 
-Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@webwynk.net>
+Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column):
        fix bug in dropping columns.  Moving columns now basically works
@@ -1568,7 +1573,7 @@ Thu Apr 12 21:04:26 2001  Tim Janik  <timj@gtk.org>
        are unsigned insts, therefore use g_value_set_uint.
        (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
 
-Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
+Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 891b8745406c5693c79e34b29be35a6b94942ee5..085569bc8c8883e5fff653beae4f39c2c0d60d82 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed Jun  6 19:31:11 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): fix silly bug
+       reported by "Padraig O'Briain" <Padraig.Obriain@Sun.COM>.
+
 Wed Jun  6 20:01:38 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c
@@ -816,7 +821,7 @@ Wed May  9 15:27:22 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_key_press): Cancel drags if
        Escape is pressed.
 
-Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@webwynk.net>
+Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_class_init): New
        "columns_changed" signal.
@@ -1022,7 +1027,7 @@ Wed May  2 17:26:22 2001  Owen Taylor  <otaylor@redhat.com>
        no way of knowing reliably whether we are viewable or
        not. (#53947)
 
-Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@webwynk.net>
+Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column):
        fix bug in dropping columns.  Moving columns now basically works
@@ -1568,7 +1573,7 @@ Thu Apr 12 21:04:26 2001  Tim Janik  <timj@gtk.org>
        are unsigned insts, therefore use g_value_set_uint.
        (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
 
-Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
+Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 891b8745406c5693c79e34b29be35a6b94942ee5..085569bc8c8883e5fff653beae4f39c2c0d60d82 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Jun  6 19:31:11 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): fix silly bug
+       reported by "Padraig O'Briain" <Padraig.Obriain@Sun.COM>.
+
 Wed Jun  6 20:01:38 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c
@@ -816,7 +821,7 @@ Wed May  9 15:27:22 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_key_press): Cancel drags if
        Escape is pressed.
 
-Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@webwynk.net>
+Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_class_init): New
        "columns_changed" signal.
@@ -1022,7 +1027,7 @@ Wed May  2 17:26:22 2001  Owen Taylor  <otaylor@redhat.com>
        no way of knowing reliably whether we are viewable or
        not. (#53947)
 
-Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@webwynk.net>
+Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column):
        fix bug in dropping columns.  Moving columns now basically works
@@ -1568,7 +1573,7 @@ Thu Apr 12 21:04:26 2001  Tim Janik  <timj@gtk.org>
        are unsigned insts, therefore use g_value_set_uint.
        (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
 
-Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
+Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 891b8745406c5693c79e34b29be35a6b94942ee5..085569bc8c8883e5fff653beae4f39c2c0d60d82 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Jun  6 19:31:11 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): fix silly bug
+       reported by "Padraig O'Briain" <Padraig.Obriain@Sun.COM>.
+
 Wed Jun  6 20:01:38 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c
@@ -816,7 +821,7 @@ Wed May  9 15:27:22 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_key_press): Cancel drags if
        Escape is pressed.
 
-Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@webwynk.net>
+Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_class_init): New
        "columns_changed" signal.
@@ -1022,7 +1027,7 @@ Wed May  2 17:26:22 2001  Owen Taylor  <otaylor@redhat.com>
        no way of knowing reliably whether we are viewable or
        not. (#53947)
 
-Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@webwynk.net>
+Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column):
        fix bug in dropping columns.  Moving columns now basically works
@@ -1568,7 +1573,7 @@ Thu Apr 12 21:04:26 2001  Tim Janik  <timj@gtk.org>
        are unsigned insts, therefore use g_value_set_uint.
        (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
 
-Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
+Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 891b8745406c5693c79e34b29be35a6b94942ee5..085569bc8c8883e5fff653beae4f39c2c0d60d82 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Jun  6 19:31:11 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): fix silly bug
+       reported by "Padraig O'Briain" <Padraig.Obriain@Sun.COM>.
+
 Wed Jun  6 20:01:38 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c
@@ -816,7 +821,7 @@ Wed May  9 15:27:22 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_key_press): Cancel drags if
        Escape is pressed.
 
-Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@webwynk.net>
+Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_class_init): New
        "columns_changed" signal.
@@ -1022,7 +1027,7 @@ Wed May  2 17:26:22 2001  Owen Taylor  <otaylor@redhat.com>
        no way of knowing reliably whether we are viewable or
        not. (#53947)
 
-Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@webwynk.net>
+Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column):
        fix bug in dropping columns.  Moving columns now basically works
@@ -1568,7 +1573,7 @@ Thu Apr 12 21:04:26 2001  Tim Janik  <timj@gtk.org>
        are unsigned insts, therefore use g_value_set_uint.
        (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
 
-Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
+Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 891b8745406c5693c79e34b29be35a6b94942ee5..085569bc8c8883e5fff653beae4f39c2c0d60d82 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Jun  6 19:31:11 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): fix silly bug
+       reported by "Padraig O'Briain" <Padraig.Obriain@Sun.COM>.
+
 Wed Jun  6 20:01:38 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c
@@ -816,7 +821,7 @@ Wed May  9 15:27:22 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_key_press): Cancel drags if
        Escape is pressed.
 
-Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@webwynk.net>
+Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_class_init): New
        "columns_changed" signal.
@@ -1022,7 +1027,7 @@ Wed May  2 17:26:22 2001  Owen Taylor  <otaylor@redhat.com>
        no way of knowing reliably whether we are viewable or
        not. (#53947)
 
-Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@webwynk.net>
+Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column):
        fix bug in dropping columns.  Moving columns now basically works
@@ -1568,7 +1573,7 @@ Thu Apr 12 21:04:26 2001  Tim Janik  <timj@gtk.org>
        are unsigned insts, therefore use g_value_set_uint.
        (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
 
-Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
+Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 891b8745406c5693c79e34b29be35a6b94942ee5..085569bc8c8883e5fff653beae4f39c2c0d60d82 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Jun  6 19:31:11 2001  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_set_model): fix silly bug
+       reported by "Padraig O'Briain" <Padraig.Obriain@Sun.COM>.
+
 Wed Jun  6 20:01:38 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c
@@ -816,7 +821,7 @@ Wed May  9 15:27:22 2001  Jonathan Blandford  <jrb@redhat.com>
        * gtk/gtktreeview.c (gtk_tree_view_key_press): Cancel drags if
        Escape is pressed.
 
-Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@webwynk.net>
+Wed May  9 09:08:44 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_class_init): New
        "columns_changed" signal.
@@ -1022,7 +1027,7 @@ Wed May  2 17:26:22 2001  Owen Taylor  <otaylor@redhat.com>
        no way of knowing reliably whether we are viewable or
        not. (#53947)
 
-Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@webwynk.net>
+Tue May  1 09:21:23 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_release_drag_column):
        fix bug in dropping columns.  Moving columns now basically works
@@ -1568,7 +1573,7 @@ Thu Apr 12 21:04:26 2001  Tim Janik  <timj@gtk.org>
        are unsigned insts, therefore use g_value_set_uint.
        (gtk_cell_renderer_set_property): Likewise, use g_value_get_uint.
 
-Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@webwynk.net>
+Sun Apr  8 05:36:06 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktextview.c (gtk_text_view_class_init): fix a fixme.
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index dfbd0510069e3103952638614ba1c8d349b1fa10..26f29833d27075c7292c6539c9e71035d64f48c6 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -5988,7 +5988,8 @@ gtk_tree_view_set_model (GtkTreeView  *tree_view,
                                                G_SIGNAL_MATCH_DATA,
                                                0, 0, NULL,
                                                NULL, tree_view);
-         _gtk_rbtree_free (tree_view->priv->tree);
+         if (tree_view->priv->tree)
+           _gtk_rbtree_free (tree_view->priv->tree);
        }
 
       if (tree_view->priv->drag_dest_row)