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

free the style's font_description before accessing a new one.

Browse Source 
2002-03-25  Sven Neumann  <sven@gimp.org>

	* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
	font_description before accessing a new one.
	(gtk_rc_parse_stock): always unref the created icon_set. #76289
This commit is contained in:
Sven Neumann
2002-03-25 20:11:27 +00:00
committed by Sven Neumann
parent cef7907ddd
commit 94168cf845
7 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2002-03-25 Sven Neumann <sven@gimp.org>
* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
font_description before accessing a new one.
(gtk_rc_parse_stock): always unref the created icon_set. #76289
2002-03-25 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkbindings.c: (gtk_binding_entry_add_signal),

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2002-03-25 Sven Neumann <sven@gimp.org>
* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
font_description before accessing a new one.
(gtk_rc_parse_stock): always unref the created icon_set. #76289
2002-03-25 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkbindings.c: (gtk_binding_entry_add_signal),

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
2002-03-25 Sven Neumann <sven@gimp.org>
* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
font_description before accessing a new one.
(gtk_rc_parse_stock): always unref the created icon_set. #76289
2002-03-25 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkbindings.c: (gtk_binding_entry_add_signal),

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
2002-03-25 Sven Neumann <sven@gimp.org>
* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
font_description before accessing a new one.
(gtk_rc_parse_stock): always unref the created icon_set. #76289
2002-03-25 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkbindings.c: (gtk_binding_entry_add_signal),

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2002-03-25 Sven Neumann <sven@gimp.org>
* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
font_description before accessing a new one.
(gtk_rc_parse_stock): always unref the created icon_set. #76289
2002-03-25 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkbindings.c: (gtk_binding_entry_add_signal),

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2002-03-25 Sven Neumann <sven@gimp.org>
* gtk/gtkrc.c (gtk_rc_parse_font_name): free the style's
font_description before accessing a new one.
(gtk_rc_parse_stock): always unref the created icon_set. #76289
2002-03-25 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkbindings.c: (gtk_binding_entry_add_signal),

15
gtk/gtkrc.c
View File

@ -2998,7 +2998,11 @@ gtk_rc_parse_font_name (GScanner *scanner,
if (token != G_TOKEN_STRING)
return G_TOKEN_STRING;
rc_style->font_desc = pango_font_description_from_string (scanner->value.v_string);
if (rc_style->font_desc)
pango_font_description_free (rc_style->font_desc);
rc_style->font_desc =
pango_font_description_from_string (scanner->value.v_string);
return G_TOKEN_NONE;
}
@ -3752,11 +3756,12 @@ gtk_rc_parse_stock (GtkRcContext *context,
}
}
if (icon_set && icon_set_valid)
if (icon_set)
{
gtk_icon_factory_add (factory,
stock_id,
icon_set);
if (icon_set_valid)
gtk_icon_factory_add (factory,
stock_id,
icon_set);
gtk_icon_set_unref (icon_set);
}