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

Applied patch from bug 326337 (leaks in the theme manager)

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

	* gnome-theme-details.c: (gtk_theme_update_remove_button): Applied patch
	from bug 326337 (leaks in the theme manager)

svn path=/trunk/; revision=7078
This commit is contained in:
Thomas Wood 2007-01-07 13:36:19 +00:00 • committed by Thomas Wood
parent 4c4c2644b8
commit 4292506da6
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/theme-switcher/ChangeLog
View file

@ -1,3 +1,8 @@
2007-01-07 Thomas Wood <thos@gnome.org>
* gnome-theme-details.c: (gtk_theme_update_remove_button): Applied patch
from bug 326337 (leaks in the theme manager)
2007-01-11 Thomas Wood <thos@gnome.org>
* gnome-theme-details.c: (gnome_theme_details_init): Applied theme

20
capplets/theme-switcher/gnome-theme-details.c
View file

@ -135,8 +135,8 @@ gtk_theme_update_remove_button (GtkTreeSelection *selection,
gchar *theme_selected;
GtkTreeModel *model;
GtkTreeIter iter;
GList *theme_list=NULL, *string_list, *list;
gchar *theme_dir = NULL;
GList *theme_list=NULL, *list;
gchar *theme_base=NULL;
GnomeVFSResult vfs_result;
GnomeVFSFileInfo *vfs_info;
@ -150,12 +150,12 @@ gtk_theme_update_remove_button (GtkTreeSelection *selection,
if (theme_selected != NULL)
{
switch (theme_type) {
case THEME_GTK: theme_dir = g_strdup("/gtk-2.0/");
case THEME_GTK: theme_base = g_strdup("/gtk-2.0/");
theme_list = gnome_theme_info_find_by_type (GNOME_THEME_GTK_2);
break;
case THEME_ICON: theme_list = gnome_theme_icon_info_find_all();
break;
case THEME_WINDOW: theme_dir = g_strdup("/metacity-1/");
case THEME_WINDOW: theme_base = g_strdup("/metacity-1/");
theme_list = gnome_theme_info_find_by_type (GNOME_THEME_METACITY);
break;
default: theme_list = NULL;
@ -163,22 +163,25 @@ gtk_theme_update_remove_button (GtkTreeSelection *selection,
}
}
string_list = NULL;
vfs_info = gnome_vfs_file_info_new ();
for (list = theme_list; list; list = list->next)
{
GnomeThemeInfo *info = list->data;
gchar *theme_dir = NULL;
if (!strcmp(info->name, theme_selected))
{
if (theme_type == THEME_ICON)
theme_dir = g_strdup(info->path);
else
theme_dir = g_strdup_printf("%s/%s", info->path, theme_dir);
theme_dir = g_strdup_printf("%s/%s", info->path, theme_base);
vfs_info = gnome_vfs_file_info_new ();
vfs_result = gnome_vfs_get_file_info (theme_dir,
vfs_info,
GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS);
g_free (theme_dir);
if (vfs_result == GNOME_VFS_OK)
{
if ((vfs_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_ACCESS) &&
@ -194,6 +197,9 @@ gtk_theme_update_remove_button (GtkTreeSelection *selection,
gnome_vfs_file_info_unref (vfs_info);
}
}
gnome_vfs_file_info_unref(vfs_info);
g_free (theme_base);
g_free (theme_selected);
}
static void