move the code for setting the color scheme for gtk thumbnails to the

2007-09-29  Jens Granseuer  <jensgr@gmx.net>

	* theme-thumbnail.c: (generate_gtk_theme_thumbnail),
	(generate_theme_thumbnail_async),
	(generate_gtk_theme_thumbnail_async): move the code for setting the
	color scheme for gtk thumbnails to the gtk-specific function. This
	means we will probably extract it twice for most thumbnails, but it
	makes for much cleaner code. Also add the scheme bit to the synchronous
	version.

svn path=/trunk/; revision=8144
This commit is contained in:
Jens Granseuer 2007-09-29 09:37:33 +00:00 committed by Jens Granseuer
parent 76936d9dc1
commit d28037d3b2
2 changed files with 29 additions and 17 deletions

View file

@ -1,3 +1,13 @@
2007-09-29 Jens Granseuer <jensgr@gmx.net>
* theme-thumbnail.c: (generate_gtk_theme_thumbnail),
(generate_theme_thumbnail_async),
(generate_gtk_theme_thumbnail_async): move the code for setting the
color scheme for gtk thumbnails to the gtk-specific function. This
means we will probably extract it twice for most thumbnails, but it
makes for much cleaner code. Also add the scheme bit to the synchronous
version.
2007-09-25 Jens Granseuer <jensgr@gmx.net>
* theme-thumbnail.c: patch up an outdated comment about how the

View file

@ -935,12 +935,17 @@ generate_meta_theme_thumbnail (GnomeThemeMetaInfo *theme_info)
GdkPixbuf *
generate_gtk_theme_thumbnail (GnomeThemeInfo *theme_info)
{
gchar *scheme;
scheme = gtkrc_get_color_scheme_for_theme (theme_info->name);
return generate_theme_thumbnail (THUMBNAIL_TYPE_GTK,
theme_info->name,
NULL,
scheme,
NULL,
NULL,
NULL);
g_free (scheme);
}
GdkPixbuf *
@ -978,8 +983,6 @@ generate_theme_thumbnail_async (gpointer theme_info,
gpointer user_data,
GDestroyNotify destroy)
{
gchar *scheme;
if (async_data.set)
{
ThemeQueueItem *item;
@ -1021,18 +1024,12 @@ generate_theme_thumbnail_async (gpointer theme_info,
async_data.user_data = user_data;
async_data.destroy = destroy;
if (!strcmp (thumbnail_type, THUMBNAIL_TYPE_GTK)) {
scheme = gtkrc_get_color_scheme_for_theme (theme_name);
gtk_color_scheme = scheme;
} else scheme = NULL;
send_thumbnail_request (thumbnail_type,
gtk_theme_name,
gtk_color_scheme,
metacity_theme_name,
icon_theme_name,
application_font);
g_free (scheme);
}
void
@ -1058,15 +1055,20 @@ generate_gtk_theme_thumbnail_async (GnomeThemeInfo *theme_info,
gpointer user_data,
GDestroyNotify destroy)
{
gchar *scheme;
scheme = gtkrc_get_color_scheme_for_theme (theme_info->name);
generate_theme_thumbnail_async (theme_info,
theme_info->name,
THUMBNAIL_TYPE_GTK,
theme_info->name,
NULL,
scheme,
NULL,
NULL,
NULL,
func, user_data, destroy);
g_free (scheme);
}
void