applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

recognize both "gtk-color-scheme" and "gtk_color_scheme" (fixes thumbnail

Browse source 
2007-05-29  Jens Granseuer  <jensgr@gmx.net>

	* gtkrc-utils.c: (gtkrc_get_color_scheme): recognize both
	"gtk-color-scheme" and "gtk_color_scheme" (fixes thumbnail generation
	for e.g. the Mist metatheme)

svn path=/trunk/; revision=7676
This commit is contained in:
Jens Granseuer 2007-05-29 19:20:07 +00:00 • committed by Jens Granseuer
parent 96299749bb
commit 6fc827db4d
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/common/ChangeLog
View file

@ -1,3 +1,9 @@
2007-05-29 Jens Granseuer <jensgr@gmx.net>
* gtkrc-utils.c: (gtkrc_get_color_scheme): recognize both
"gtk-color-scheme" and "gtk_color_scheme" (fixes thumbnail generation
for e.g. the Mist metatheme)
2007-05-28 Jens Granseuer <jensgr@gmx.net> 2007-05-28 Jens Granseuer <jensgr@gmx.net>
* gconf-property-editor.c: * gconf-property-editor.c:

18
capplets/common/gtkrc-utils.c
View file

@ -142,10 +142,11 @@ gtkrc_get_color_scheme (gchar *filename)
GSList *files = NULL; GSList *files = NULL;
GSList *read_files = NULL; GSList *read_files = NULL;
GTokenType token; GTokenType token;
GScanner *scanner = g_scanner_new (NULL); GScanner *scanner = gtk_rc_scanner_new ();
g_scanner_scope_add_symbol (scanner, 0, "include", INCLUDE_SYMBOL); g_scanner_scope_add_symbol (scanner, 0, "include", INCLUDE_SYMBOL);
g_scanner_scope_add_symbol (scanner, 0, "gtk_color_scheme", COLOR_SCHEME_SYMBOL); g_scanner_scope_add_symbol (scanner, 0, "gtk_color_scheme", COLOR_SCHEME_SYMBOL);
g_scanner_scope_add_symbol (scanner, 0, "gtk-color-scheme", COLOR_SCHEME_SYMBOL);
files = g_slist_prepend (files, g_strdup (filename)); files = g_slist_prepend (files, g_strdup (filename));
while (files != NULL) while (files != NULL)
@ -171,19 +172,14 @@ gtkrc_get_color_scheme (gchar *filename)
g_scanner_input_file (scanner, file); g_scanner_input_file (scanner, file);
while ((token = g_scanner_get_next_token (scanner)) != G_TOKEN_EOF) while ((token = g_scanner_get_next_token (scanner)) != G_TOKEN_EOF)
{ {
GTokenType string_token; if (token == COLOR_SCHEME_SYMBOL)
if (token != G_TOKEN_SYMBOL)
continue;
if (scanner->value.v_symbol == COLOR_SCHEME_SYMBOL)
{ {
if (g_scanner_get_next_token (scanner) != '=') if (g_scanner_get_next_token (scanner) != '=')
continue; continue;
string_token = g_scanner_get_next_token (scanner); token = g_scanner_get_next_token (scanner);
if (string_token != G_TOKEN_STRING) if (token != G_TOKEN_STRING)
continue; continue;
if (result) g_free (result);
g_free (result);
result = g_strdup (scanner->value.v_string); result = g_strdup (scanner->value.v_string);
} }
} }
@ -192,5 +188,3 @@ gtkrc_get_color_scheme (gchar *filename)
g_scanner_destroy (scanner); g_scanner_destroy (scanner);
return result; return result;
} }