From d28037d3b2d33a6123bff6f64782d1b47c7494f7 Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Sat, 29 Sep 2007 09:37:33 +0000 Subject: [PATCH] move the code for setting the color scheme for gtk thumbnails to the 2007-09-29 Jens Granseuer * 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 --- capplets/common/ChangeLog | 10 +++++++++ capplets/common/theme-thumbnail.c | 36 ++++++++++++++++--------------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index 3e0000096..ac62db8b5 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,3 +1,13 @@ +2007-09-29 Jens Granseuer + + * 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 * theme-thumbnail.c: patch up an outdated comment about how the diff --git a/capplets/common/theme-thumbnail.c b/capplets/common/theme-thumbnail.c index 99db476e8..e2b9b1715 100644 --- a/capplets/common/theme-thumbnail.c +++ b/capplets/common/theme-thumbnail.c @@ -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, - NULL, - NULL, - NULL, - func, user_data, destroy); + theme_info->name, + THUMBNAIL_TYPE_GTK, + theme_info->name, + scheme, + NULL, + NULL, + NULL, + func, user_data, destroy); + g_free (scheme); } void