From bc8e3ee00772c3af7ae3836fde779d3c5dc92c8d Mon Sep 17 00:00:00 2001 From: Thomas Wood Date: Sun, 4 Mar 2007 18:28:57 +0000 Subject: [PATCH] Don't try and open null filenames Reset the gtk_color_scheme after a 2007-03-04 Thomas Wood * gnome-theme-info.c: (gnome_theme_read_meta_theme): Don't try and open null filenames * theme-thumbnail.c: (message_from_capplet): Reset the gtk_color_scheme after a thumbnail has been generated. svn path=/trunk/; revision=7359 --- capplets/common/ChangeLog | 7 +++++++ capplets/common/gnome-theme-info.c | 7 +++++-- capplets/common/theme-thumbnail.c | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog index 6aa26a6bf..0d382b0ff 100644 --- a/capplets/common/ChangeLog +++ b/capplets/common/ChangeLog @@ -1,3 +1,10 @@ +2007-03-04 Thomas Wood + + * gnome-theme-info.c: (gnome_theme_read_meta_theme): Don't try and open null + filenames + * theme-thumbnail.c: (message_from_capplet): Reset the gtk_color_scheme after + a thumbnail has been generated. + 2007-03-04 Thomas Wood * Makefile.am: diff --git a/capplets/common/gnome-theme-info.c b/capplets/common/gnome-theme-info.c index 0d0f0743a..8f4d5ed19 100644 --- a/capplets/common/gnome-theme-info.c +++ b/capplets/common/gnome-theme-info.c @@ -359,8 +359,11 @@ gnome_theme_read_meta_theme (GnomeVFSURI *meta_theme_uri) { /* try to find the color scheme from the gtkrc */ gchar *gtkrc_file = gtkrc_find_named (meta_theme_info->gtk_theme_name); - str = gtkrc_get_color_scheme (gtkrc_file); - g_free (gtkrc_file); + if (gtkrc_file) + { + str = gtkrc_get_color_scheme (gtkrc_file); + g_free (gtkrc_file); + } } if (str != NULL) { diff --git a/capplets/common/theme-thumbnail.c b/capplets/common/theme-thumbnail.c index 048337045..43186ee68 100644 --- a/capplets/common/theme-thumbnail.c +++ b/capplets/common/theme-thumbnail.c @@ -403,6 +403,7 @@ message_from_capplet (GIOChannel *source, g_object_unref (pixbuf); theme_thumbnail_data->status = READY_FOR_THEME; g_byte_array_set_size (theme_thumbnail_data->control_theme_name, 0); + g_byte_array_set_size (theme_thumbnail_data->gtk_color_scheme, 0); g_byte_array_set_size (theme_thumbnail_data->wm_theme_name, 0); g_byte_array_set_size (theme_thumbnail_data->icon_theme_name, 0); g_byte_array_set_size (theme_thumbnail_data->application_font, 0);