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

Don't try and open null filenames Reset the gtk_color_scheme after a

Browse source 
2007-03-04  Thomas Wood  <thos@gnome.org>

	* 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
This commit is contained in:
Thomas Wood 2007-03-04 18:28:57 +00:00 • committed by Thomas Wood
parent 68b68e08b8
commit bc8e3ee007
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
capplets/common/ChangeLog
View file

@ -1,3 +1,10 @@
2007-03-04 Thomas Wood <thos@gnome.org>
* 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 <thos@gnome.org>
* Makefile.am:

7
capplets/common/gnome-theme-info.c
View file

@ -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)
{

1
capplets/common/theme-thumbnail.c
View file

@ -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);