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

make it possible to skip engine information if we're not interested and

Browse source 
2007-06-10  Jens Granseuer  <jensgr@gmx.net>

	* gtkrc-utils.c: (gtkrc_get_details), (gtkrc_get_color_scheme):
	make it possible to skip engine information if we're not interested
	and fix a warning

svn path=/trunk/; revision=7712
This commit is contained in:
Jens Granseuer 2007-06-10 18:10:38 +00:00 • committed by Jens Granseuer
parent a5189eddb9
commit 934b33e8c7
2 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/common/ChangeLog
View file

@ -1,3 +1,9 @@
2007-06-10 Jens Granseuer <jensgr@gmx.net>
* gtkrc-utils.c: (gtkrc_get_details), (gtkrc_get_color_scheme):
make it possible to skip engine information if we're not interested
and fix a warning
2007-06-10 Jens Granseuer <jensgr@gmx.net> 2007-06-10 Jens Granseuer <jensgr@gmx.net>
* gnome-theme-apply.c: (gnome_meta_theme_set): add some more checks so * gnome-theme-apply.c: (gnome_meta_theme_set): add some more checks so

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

@ -63,7 +63,8 @@ gtkrc_get_details (gchar *filename, GSList **engines, GSList **symbolic_colors)
GScanner *scanner = g_scanner_new (NULL); GScanner *scanner = g_scanner_new (NULL);
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, "engine", ENGINE_SYMBOL); if (engines != NULL)
g_scanner_scope_add_symbol (scanner, 0, "engine", ENGINE_SYMBOL);
files = g_slist_prepend (files, g_strdup (filename)); files = g_slist_prepend (files, g_strdup (filename));
while (files != NULL) while (files != NULL)
@ -131,6 +132,8 @@ gtkrc_get_details (gchar *filename, GSList **engines, GSList **symbolic_colors)
} }
} }
} }
g_scanner_destroy (scanner);
} }
@ -172,7 +175,7 @@ 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)
{ {
if (token == COLOR_SCHEME_SYMBOL) if (GINT_TO_POINTER (token) == COLOR_SCHEME_SYMBOL)
{ {
if (g_scanner_get_next_token (scanner) != '=') if (g_scanner_get_next_token (scanner) != '=')
continue; continue;