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

- Fix theme installation (free called before last last use of a string) -

Browse source 
2007-07-29  Thomas Wood  <thos@gnome.org>

	* theme-installer.c: (file_theme_type), (gnome_theme_install_real):
	- Fix theme installation (free called before last last use of a string)
	- Update icon cache when installing icon themes (closes bug 355486)

svn path=/trunk/; revision=7919
This commit is contained in:
Thomas Wood 2007-07-29 11:03:05 +00:00 • committed by Thomas Wood
parent d9683907b5
commit 930245a60b
2 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/appearance/ChangeLog
View file

@ -1,3 +1,9 @@
2007-07-29 Thomas Wood <thos@gnome.org>
* theme-installer.c: (file_theme_type), (gnome_theme_install_real):
- Fix theme installation (free called before last last use of a string)
- Update icon cache when installing icon themes (closes bug 355486)
2007-07-29 Thomas Wood <thos@gnome.org>
* data/appearance.glade: Fix mnemonics and Customize Theme window title.

20
capplets/appearance/theme-installer.c
View file

@ -74,7 +74,6 @@ file_theme_type (const gchar *dir)
filename = g_build_filename (dir, "index.theme", NULL);
src_uri = gnome_vfs_uri_new (filename);
g_free (filename);
exists = gnome_vfs_uri_exists (src_uri);
gnome_vfs_uri_unref (src_uri);
@ -103,6 +102,7 @@ file_theme_type (const gchar *dir)
if (match)
return THEME_GNOME;
}
g_free (filename);
filename = g_build_filename (dir, "gtk-2.0", "gtkrc", NULL);
src_uri = gnome_vfs_uri_new (filename);
@ -271,15 +271,21 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
if (g_file_test (path, G_FILE_TEST_IS_DIR)
&& (file_theme_type (path) == THEME_ICON))
{
gchar *new_path;
gchar *new_path, *update_icon_cache;
new_path = g_build_path (G_DIR_SEPARATOR_S,
g_get_home_dir (),
".icons",
theme_name, NULL);
update_icon_cache = g_strdup_printf ("gtk-update-icon-cache %s", new_path);
/* XXX: make some noise if we couldn't install it? */
gnome_vfs_move (path, new_path, FALSE);
/* update icon cache - shouldn't really matter if this fails */
g_spawn_command_line_async (update_icon_cache, NULL);
g_free (new_path);
g_free (update_icon_cache);
}
g_free (path);
}
@ -305,6 +311,16 @@ gnome_theme_install_real (gint filetype, const gchar *tmp_dir, const gchar *them
gtk_widget_destroy (dialog);
success = FALSE;
} else {
if (theme_type == THEME_ICON)
{
gchar *update_icon_cache;
/* update icon cache - shouldn't really matter if this fails */
update_icon_cache = g_strdup_printf ("gtk-update-icon-cache %s", target_dir);
g_spawn_command_line_async (update_icon_cache, NULL);
g_free (update_icon_cache);
}
/* Ask to apply theme (if we can) */
if (theme_type == THEME_GTK || theme_type == THEME_METACITY || theme_type == THEME_ICON)
{