From eba4c9a85e406daee3a70196efbc1a511cd4d45c Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 17 Dec 1998 15:51:15 +0000 Subject: [PATCH] Free previous label->label_wc. Thu Dec 17 10:53:20 1998 Owen Taylor * gtk/gtklabel.c (gtk_label_set_text): Free previous label->label_wc. * gtk/testgtkrc: Leave font, not fontset commented in by default. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtklabel.c | 3 +++ gtk/testgtkrc | 4 ++-- tests/testgtkrc | 4 ++-- 10 files changed, 70 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ff09807d1..04dfb90920 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Dec 17 10:53:20 1998 Owen Taylor + + * 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 * 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 * 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 * gtk/gtklabel.c (gtk_label_expose): Remove diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9ff09807d1..04dfb90920 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Thu Dec 17 10:53:20 1998 Owen Taylor + + * 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 * 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 * 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 * gtk/gtklabel.c (gtk_label_expose): Remove diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9ff09807d1..04dfb90920 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Thu Dec 17 10:53:20 1998 Owen Taylor + + * 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 * 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 * 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 * gtk/gtklabel.c (gtk_label_expose): Remove diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9ff09807d1..04dfb90920 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Thu Dec 17 10:53:20 1998 Owen Taylor + + * 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 * 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 * 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 * gtk/gtklabel.c (gtk_label_expose): Remove diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9ff09807d1..04dfb90920 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Thu Dec 17 10:53:20 1998 Owen Taylor + + * 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 * 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 * 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 * gtk/gtklabel.c (gtk_label_expose): Remove diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9ff09807d1..04dfb90920 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Thu Dec 17 10:53:20 1998 Owen Taylor + + * 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 * 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 * 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 * gtk/gtklabel.c (gtk_label_expose): Remove diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9ff09807d1..04dfb90920 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Thu Dec 17 10:53:20 1998 Owen Taylor + + * 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 * 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 * 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 * gtk/gtklabel.c (gtk_label_expose): Remove diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 48d7e9add5..c08538308d 100644 --- 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 b8c6a8ce91..582b83d4c6 100644 --- 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 b8c6a8ce91..582b83d4c6 100644 --- 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