callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Free previous label->label_wc.

Browse Source 
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.
This commit is contained in:
Owen Taylor
1998-12-17 15:51:15 +00:00
committed by Owen Taylor
parent 06449bebe1
commit eba4c9a85e
10 changed files with 70 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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> 1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed * 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 * gdk/gdkevents.c: updated call to g_main_add_poll
instead of g_main_poll_add instead of g_main_poll_add
>>>>>>> 1.848
Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com> Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove * gtk/gtklabel.c (gtk_label_expose): Remove

9
ChangeLog.pre-2-0
View File

@ -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> 1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed * 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 * gdk/gdkevents.c: updated call to g_main_add_poll
instead of g_main_poll_add instead of g_main_poll_add
>>>>>>> 1.848
Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com> Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove * gtk/gtklabel.c (gtk_label_expose): Remove

9
ChangeLog.pre-2-10
View File

@ -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> 1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed * 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 * gdk/gdkevents.c: updated call to g_main_add_poll
instead of g_main_poll_add instead of g_main_poll_add
>>>>>>> 1.848
Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com> Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove * gtk/gtklabel.c (gtk_label_expose): Remove

9
ChangeLog.pre-2-2
View File

@ -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> 1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed * 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 * gdk/gdkevents.c: updated call to g_main_add_poll
instead of g_main_poll_add instead of g_main_poll_add
>>>>>>> 1.848
Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com> Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove * gtk/gtklabel.c (gtk_label_expose): Remove

9
ChangeLog.pre-2-4
View File

@ -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> 1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed * 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 * gdk/gdkevents.c: updated call to g_main_add_poll
instead of g_main_poll_add instead of g_main_poll_add
>>>>>>> 1.848
Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com> Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove * gtk/gtklabel.c (gtk_label_expose): Remove

9
ChangeLog.pre-2-6
View File

@ -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> 1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed * 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 * gdk/gdkevents.c: updated call to g_main_add_poll
instead of g_main_poll_add instead of g_main_poll_add
>>>>>>> 1.848
Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com> Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove * gtk/gtklabel.c (gtk_label_expose): Remove

9
ChangeLog.pre-2-8
View File

@ -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> 1998-12-17 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* gdk/gdkim.c: Define gdk_use_mb outside USE_XIM guard. Removed * 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 * gdk/gdkevents.c: updated call to g_main_add_poll
instead of g_main_poll_add instead of g_main_poll_add
>>>>>>> 1.848
Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com> Wed Dec 16 23:32:05 1998 Owen Taylor <otaylor@redhat.com>
* gtk/gtklabel.c (gtk_label_expose): Remove * gtk/gtklabel.c (gtk_label_expose): Remove

3
gtk/gtklabel.c
View File

@ -228,6 +228,9 @@ gtk_label_set_text (GtkLabel *label,
if (label->label) if (label->label)
g_free (label->label); g_free (label->label);
if (label->label_wc)
g_free (label->label_wc);
label->label = g_strdup (str); label->label = g_strdup (str);
/* Convert text to wide characters */ /* Convert text to wide characters */

4
gtk/testgtkrc
View File

@ -17,8 +17,8 @@ pixmap_path "."
style "defaultfont" style "defaultfont"
{ {
fontset = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*,*" # fontset = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*,*"
# font = "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,*" font = "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,*"
} }
# common default # common default

4
tests/testgtkrc
View File

@ -17,8 +17,8 @@ pixmap_path "."
style "defaultfont" style "defaultfont"
{ {
fontset = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*,*" # fontset = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*,*"
# font = "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,*" font = "-adobe-helvetica-medium-r-normal--*-120-*-*-*-*-*-*,*"
} }
# common default # common default