call gtk_text_view_destroy_layout after gtk_text_view_set_buffer (which

2001-10-25  Matt Wilson  <msw@redhat.com>

	* gtk/gtktextview.c (gtk_text_view_destroy): call
	gtk_text_view_destroy_layout after gtk_text_view_set_buffer (which
	now invalidates) so that we remove our idle functions.
	(gtk_text_view_destroy_layout): remove the first_validate_idle as
	well.

diff --git a/ChangeLog b/ChangeLog
index e7308c64634e5560986098bc3341215b99401a9c..cc89238dfb97ed51f34c1f06f56341544091472b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2001-10-25  Matt Wilson  <msw@redhat.com>
 
+       * gtk/gtktextview.c (gtk_text_view_destroy): call
+       gtk_text_view_destroy_layout after gtk_text_view_set_buffer (which
+       now invalidates) so that we remove our idle functions.
+       (gtk_text_view_destroy_layout): remove the first_validate_idle as
+       well.
+
        * gtk/gtktexttag.c (gtk_text_tag_class_init): the valid range for
        the 'indent' property is G_MININT to G_MAXINT.  Don't use
        -G_MAXINT for the minimum of the 'rise' property, use G_MININT

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e7308c64634e5560986098bc3341215b99401a9c..cc89238dfb97ed51f34c1f06f56341544091472b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,5 +1,11 @@
 2001-10-25  Matt Wilson  <msw@redhat.com>
 
+       * gtk/gtktextview.c (gtk_text_view_destroy): call
+       gtk_text_view_destroy_layout after gtk_text_view_set_buffer (which
+       now invalidates) so that we remove our idle functions.
+       (gtk_text_view_destroy_layout): remove the first_validate_idle as
+       well.
+
        * gtk/gtktexttag.c (gtk_text_tag_class_init): the valid range for
        the 'indent' property is G_MININT to G_MAXINT.  Don't use
        -G_MAXINT for the minimum of the 'rise' property, use G_MININT

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e7308c64634e5560986098bc3341215b99401a9c..cc89238dfb97ed51f34c1f06f56341544091472b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 2001-10-25  Matt Wilson  <msw@redhat.com>
 
+       * gtk/gtktextview.c (gtk_text_view_destroy): call
+       gtk_text_view_destroy_layout after gtk_text_view_set_buffer (which
+       now invalidates) so that we remove our idle functions.
+       (gtk_text_view_destroy_layout): remove the first_validate_idle as
+       well.
+
        * gtk/gtktexttag.c (gtk_text_tag_class_init): the valid range for
        the 'indent' property is G_MININT to G_MAXINT.  Don't use
        -G_MAXINT for the minimum of the 'rise' property, use G_MININT

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e7308c64634e5560986098bc3341215b99401a9c..cc89238dfb97ed51f34c1f06f56341544091472b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,5 +1,11 @@
 2001-10-25  Matt Wilson  <msw@redhat.com>
 
+       * gtk/gtktextview.c (gtk_text_view_destroy): call
+       gtk_text_view_destroy_layout after gtk_text_view_set_buffer (which
+       now invalidates) so that we remove our idle functions.
+       (gtk_text_view_destroy_layout): remove the first_validate_idle as
+       well.
+
        * gtk/gtktexttag.c (gtk_text_tag_class_init): the valid range for
        the 'indent' property is G_MININT to G_MAXINT.  Don't use
        -G_MAXINT for the minimum of the 'rise' property, use G_MININT

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e7308c64634e5560986098bc3341215b99401a9c..cc89238dfb97ed51f34c1f06f56341544091472b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,5 +1,11 @@
 2001-10-25  Matt Wilson  <msw@redhat.com>
 
+       * gtk/gtktextview.c (gtk_text_view_destroy): call
+       gtk_text_view_destroy_layout after gtk_text_view_set_buffer (which
+       now invalidates) so that we remove our idle functions.
+       (gtk_text_view_destroy_layout): remove the first_validate_idle as
+       well.
+
        * gtk/gtktexttag.c (gtk_text_tag_class_init): the valid range for
        the 'indent' property is G_MININT to G_MAXINT.  Don't use
        -G_MAXINT for the minimum of the 'rise' property, use G_MININT

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e7308c64634e5560986098bc3341215b99401a9c..cc89238dfb97ed51f34c1f06f56341544091472b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,11 @@
 2001-10-25  Matt Wilson  <msw@redhat.com>
 
+       * gtk/gtktextview.c (gtk_text_view_destroy): call
+       gtk_text_view_destroy_layout after gtk_text_view_set_buffer (which
+       now invalidates) so that we remove our idle functions.
+       (gtk_text_view_destroy_layout): remove the first_validate_idle as
+       well.
+
        * gtk/gtktexttag.c (gtk_text_tag_class_init): the valid range for
        the 'indent' property is G_MININT to G_MAXINT.  Don't use
        -G_MAXINT for the minimum of the 'rise' property, use G_MININT

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e7308c64634e5560986098bc3341215b99401a9c..cc89238dfb97ed51f34c1f06f56341544091472b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,11 @@
 2001-10-25  Matt Wilson  <msw@redhat.com>
 
+       * gtk/gtktextview.c (gtk_text_view_destroy): call
+       gtk_text_view_destroy_layout after gtk_text_view_set_buffer (which
+       now invalidates) so that we remove our idle functions.
+       (gtk_text_view_destroy_layout): remove the first_validate_idle as
+       well.
+
        * gtk/gtktexttag.c (gtk_text_tag_class_init): the valid range for
        the 'indent' property is G_MININT to G_MAXINT.  Don't use
        -G_MAXINT for the minimum of the 'rise' property, use G_MININT

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 523a24504f9d8d7fbbe6f896248385cfa171610e..e33c86d37df9d17737d48f2e1e7e5acd58aa51b9 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -2166,8 +2166,8 @@ gtk_text_view_destroy (GtkObject *object)
 
   layout = text_view->layout;
   
-  gtk_text_view_destroy_layout (text_view);
   gtk_text_view_set_buffer (text_view, NULL);
+  gtk_text_view_destroy_layout (text_view);
 
   (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
@@ -4666,14 +4666,19 @@ gtk_text_view_destroy_layout (GtkTextView *text_view)
     {
       GSList *tmp_list;
 
-      if (text_view->incremental_validate_idle)
-        {
-          g_source_remove (text_view->incremental_validate_idle);
-          text_view->incremental_validate_idle = 0;
-        }
+      if (text_view->first_validate_idle)
+       {
+         g_source_remove (text_view->first_validate_idle);
+         text_view->first_validate_idle = 0;
+       }
 
-      /* Remove layout from all anchored children */
+      if (text_view->incremental_validate_idle)
+       {
+         g_source_remove (text_view->incremental_validate_idle);
+         text_view->incremental_validate_idle = 0;
+       }
       
+      /* Remove layout from all anchored children */
       tmp_list = text_view->children;
       while (tmp_list != NULL)
         {