minor buglet

diff --git a/ChangeLog b/ChangeLog
index b3e573e7766115422da76540f7523c33acb79ed5..0538dab3c6f96d6fc121446401db1375be3dcd4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
        2 * hadj.
+       (gtk_text_finalize): only unref the current_font if we have
+       been realized.
 
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b3e573e7766115422da76540f7523c33acb79ed5..0538dab3c6f96d6fc121446401db1375be3dcd4c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -2,6 +2,8 @@ Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
        2 * hadj.
+       (gtk_text_finalize): only unref the current_font if we have
+       been realized.
 
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b3e573e7766115422da76540f7523c33acb79ed5..0538dab3c6f96d6fc121446401db1375be3dcd4c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -2,6 +2,8 @@ Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
        2 * hadj.
+       (gtk_text_finalize): only unref the current_font if we have
+       been realized.
 
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b3e573e7766115422da76540f7523c33acb79ed5..0538dab3c6f96d6fc121446401db1375be3dcd4c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -2,6 +2,8 @@ Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
        2 * hadj.
+       (gtk_text_finalize): only unref the current_font if we have
+       been realized.
 
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b3e573e7766115422da76540f7523c33acb79ed5..0538dab3c6f96d6fc121446401db1375be3dcd4c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -2,6 +2,8 @@ Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
        2 * hadj.
+       (gtk_text_finalize): only unref the current_font if we have
+       been realized.
 
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b3e573e7766115422da76540f7523c33acb79ed5..0538dab3c6f96d6fc121446401db1375be3dcd4c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -2,6 +2,8 @@ Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
        2 * hadj.
+       (gtk_text_finalize): only unref the current_font if we have
+       been realized.
 
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b3e573e7766115422da76540f7523c33acb79ed5..0538dab3c6f96d6fc121446401db1375be3dcd4c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -2,6 +2,8 @@ Mon Nov 23 03:21:17 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtktext.c (gtk_text_destroy): disconnect hadj & vadj, not
        2 * hadj.
+       (gtk_text_finalize): only unref the current_font if we have
+       been realized.
 
 Sat Nov 21 18:41:13 CST 1998 Shawn T. Amundson <amundson@gtk.org>
 

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 195b74dafff5052ef969f7f5af8a4eae699ba797..132f9266a9eb4c9bce33819420e158a198a90757 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -1178,7 +1178,8 @@ gtk_text_finalize (GtkObject *object)
       tmp_list = tmp_list->next;
     }
 
-  text_font_unref (text->current_font);
+  if (text->current_font)
+    text_font_unref (text->current_font);
   
   g_list_free (text->text_properties);