Free previous label->label_wc.

Thu Dec 17 10:53:20 1998  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtklabel.c (gtk_label_set_text): Free
	previous label->label_wc.

	* gtk/testgtkrc: Leave font, not fontset commented
	in by default.

diff --git a/ChangeLog b/ChangeLog
index 9ff09807d1f00dda87ee06b5d929a56635bb12f7..04dfb909207c1956facde3dbe8e2a5c0a34056bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Dec 17 10:53:20 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_set_text): Free 
+       previous label->label_wc.
+
+       * gtk/testgtkrc: Leave font, not fontset commented
+       in by default.
+
 1998-12-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
@@ -29,6 +37,7 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
        * gdk/gdkevents.c: updated call to g_main_add_poll
           instead of g_main_poll_add
 
+>>>>>>> 1.848
 Wed Dec 16 23:32:05 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Remove 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9ff09807d1f00dda87ee06b5d929a56635bb12f7..04dfb909207c1956facde3dbe8e2a5c0a34056bc 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+Thu Dec 17 10:53:20 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_set_text): Free 
+       previous label->label_wc.
+
+       * gtk/testgtkrc: Leave font, not fontset commented
+       in by default.
+
 1998-12-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
@@ -29,6 +37,7 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
        * gdk/gdkevents.c: updated call to g_main_add_poll
           instead of g_main_poll_add
 
+>>>>>>> 1.848
 Wed Dec 16 23:32:05 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Remove 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9ff09807d1f00dda87ee06b5d929a56635bb12f7..04dfb909207c1956facde3dbe8e2a5c0a34056bc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Thu Dec 17 10:53:20 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_set_text): Free 
+       previous label->label_wc.
+
+       * gtk/testgtkrc: Leave font, not fontset commented
+       in by default.
+
 1998-12-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
@@ -29,6 +37,7 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
        * gdk/gdkevents.c: updated call to g_main_add_poll
           instead of g_main_poll_add
 
+>>>>>>> 1.848
 Wed Dec 16 23:32:05 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Remove 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9ff09807d1f00dda87ee06b5d929a56635bb12f7..04dfb909207c1956facde3dbe8e2a5c0a34056bc 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Thu Dec 17 10:53:20 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_set_text): Free 
+       previous label->label_wc.
+
+       * gtk/testgtkrc: Leave font, not fontset commented
+       in by default.
+
 1998-12-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
@@ -29,6 +37,7 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
        * gdk/gdkevents.c: updated call to g_main_add_poll
           instead of g_main_poll_add
 
+>>>>>>> 1.848
 Wed Dec 16 23:32:05 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Remove 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9ff09807d1f00dda87ee06b5d929a56635bb12f7..04dfb909207c1956facde3dbe8e2a5c0a34056bc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Thu Dec 17 10:53:20 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_set_text): Free 
+       previous label->label_wc.
+
+       * gtk/testgtkrc: Leave font, not fontset commented
+       in by default.
+
 1998-12-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
@@ -29,6 +37,7 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
        * gdk/gdkevents.c: updated call to g_main_add_poll
           instead of g_main_poll_add
 
+>>>>>>> 1.848
 Wed Dec 16 23:32:05 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Remove 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9ff09807d1f00dda87ee06b5d929a56635bb12f7..04dfb909207c1956facde3dbe8e2a5c0a34056bc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Thu Dec 17 10:53:20 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_set_text): Free 
+       previous label->label_wc.
+
+       * gtk/testgtkrc: Leave font, not fontset commented
+       in by default.
+
 1998-12-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
@@ -29,6 +37,7 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
        * gdk/gdkevents.c: updated call to g_main_add_poll
           instead of g_main_poll_add
 
+>>>>>>> 1.848
 Wed Dec 16 23:32:05 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Remove 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9ff09807d1f00dda87ee06b5d929a56635bb12f7..04dfb909207c1956facde3dbe8e2a5c0a34056bc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Thu Dec 17 10:53:20 1998  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtklabel.c (gtk_label_set_text): Free 
+       previous label->label_wc.
+
+       * gtk/testgtkrc: Leave font, not fontset commented
+       in by default.
+
 1998-12-17  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed
@@ -29,6 +37,7 @@ Wed Dec 16 22:38:22 CST 1998 Shawn T. Amundson <amundson@gtk.org>
        * gdk/gdkevents.c: updated call to g_main_add_poll
           instead of g_main_poll_add
 
+>>>>>>> 1.848
 Wed Dec 16 23:32:05 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtklabel.c (gtk_label_expose): Remove 

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 48d7e9add54b24740ae87294f9b1bbbdfec4a293..c08538308ddf44941b89ab82ad95d76cd29285ed 100644 (file)
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -228,6 +228,9 @@ gtk_label_set_text (GtkLabel *label,
 
   if (label->label)
     g_free (label->label);
+  if (label->label_wc)
+    g_free (label->label_wc);
+
   label->label = g_strdup (str);
 
   /* Convert text to wide characters */

diff --git a/gtk/testgtkrc b/gtk/testgtkrc
index b8c6a8ce91833cf6a0d97345643b2e9dd14c3781..582b83d4c6cc7fc7e5cd322c8903dc838364f037 100644 (file)
--- a/gtk/testgtkrc
+++ b/gtk/testgtkrc
@@ -17,8 +17,8 @@ pixmap_path "."
 
 style "defaultfont"
 {
-  fontset = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*,*"
-#  font = "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,*"
+#  fontset = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*,*"
+  font = "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,*"
 }
 
 # common default

diff --git a/tests/testgtkrc b/tests/testgtkrc
index b8c6a8ce91833cf6a0d97345643b2e9dd14c3781..582b83d4c6cc7fc7e5cd322c8903dc838364f037 100644 (file)
--- a/tests/testgtkrc
+++ b/tests/testgtkrc
@@ -17,8 +17,8 @@ pixmap_path "."
 
 style "defaultfont"
 {
-  fontset = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*,*"
-#  font = "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,*"
+#  fontset = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*,*"
+  font = "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,*"
 }
 
 # common default