AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't modify scanner->value, copy it first. (#165693, Tommi Komulainen)

Browse Source 
2005-04-06  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkrc.c (gtk_rc_parse_style): Don't modify scanner->value,
	copy it first.  (#165693, Tommi Komulainen)
This commit is contained in:
Matthias Clasen 2005-04-06 12:45:55 +00:00 committed by Matthias Clasen
parent 1e8326d418
commit 4d74d5e0cd
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-04-06 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkrc.c (gtk_rc_parse_style): Don't modify scanner->value,
copy it first. (#165693, Tommi Komulainen)
2005-04-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_grab_focus):

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2005-04-06 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkrc.c (gtk_rc_parse_style): Don't modify scanner->value,
copy it first. (#165693, Tommi Komulainen)
2005-04-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_grab_focus):

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2005-04-06 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkrc.c (gtk_rc_parse_style): Don't modify scanner->value,
copy it first. (#165693, Tommi Komulainen)
2005-04-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_grab_focus):

7
gtk/gtkrc.c
View File

@ -2696,6 +2696,7 @@ gtk_rc_parse_style (GtkRcContext *context,
scanner->next_value.v_identifier[0] <= 'Z') /* match namespaced type names */
{
GtkRcProperty prop = { 0, 0, NULL, { 0, }, };
gchar *name;
g_scanner_get_next_token (scanner); /* eat type name */
prop.type_name = g_quark_from_string (scanner->value.v_identifier);
@ -2713,8 +2714,10 @@ gtk_rc_parse_style (GtkRcContext *context,
}
/* it's important that we do the same canonification as GParamSpecPool here */
g_strcanon (scanner->value.v_identifier, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
prop.property_name = g_quark_from_string (scanner->value.v_identifier);
name = g_strdup (scanner->value.v_identifier);
g_strcanon (name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
prop.property_name = g_quark_from_string (name);
g_free (name)
token = gtk_rc_parse_assignment (scanner, &prop);
if (token == G_TOKEN_NONE)