fix leaks (bug #469531)

2007-08-23  Jens Granseuer  <jensgr@gmx.net>

	* appearance-themes.c: (theme_get_thumbnail_from_cache):
	* gnome-wp-item.c: (gnome_wp_item_update_description): fix leaks (bug
	#469531)

2007-08-23  Jens Granseuer  <jensgr@gmx.net>

	* gnome-theme-info.c: (gnome_theme_is_writable): cast to proper type
	* theme-thumbnail.c: (create_metacity_theme_pixbuf): free the metacity
	theme after use (bug #469531)

svn path=/trunk/; revision=8040
This commit is contained in:
Jens Granseuer 2007-08-23 19:02:28 +00:00 committed by Jens Granseuer
parent ae74c50d9a
commit 1e5c9968e2
6 changed files with 20 additions and 3 deletions

View file

@ -1,3 +1,9 @@
2007-08-23 Jens Granseuer <jensgr@gmx.net>
* appearance-themes.c: (theme_get_thumbnail_from_cache):
* gnome-wp-item.c: (gnome_wp_item_update_description): fix leaks (bug
#469531)
2007-08-23 Jens Granseuer <jensgr@gmx.net>
* appearance-font.c: (cb_show_details): simply set the upper bound of

View file

@ -136,8 +136,10 @@ theme_get_thumbnail_from_cache (GnomeThemeMetaInfo *info, AppearanceData *data)
path, mtime);
g_free (path);
if (thumb_filename != NULL)
if (thumb_filename != NULL) {
thumb = gdk_pixbuf_new_from_file (thumb_filename, NULL);
g_free (thumb_filename);
}
return thumb;
}

View file

@ -356,6 +356,7 @@ void gnome_wp_item_update_description (GnomeWPItem * item) {
if (!strcmp (item->filename, "(none)")) {
item->description = g_strdup (item->name);
} else {
gchar *dirname = g_path_get_dirname (item->filename);
/* translators: <b>wallpaper name</b>
* mime type, x pixel(s) by y pixel(s)
* Folder: /path/to/file
@ -370,6 +371,7 @@ void gnome_wp_item_update_description (GnomeWPItem * item) {
ngettext ("pixel", "pixels", item->width),
item->height,
ngettext ("pixel", "pixels", item->height),
g_path_get_dirname (item->filename));
dirname);
g_free (dirname);
}
}

View file

@ -1,3 +1,9 @@
2007-08-23 Jens Granseuer <jensgr@gmx.net>
* gnome-theme-info.c: (gnome_theme_is_writable): cast to proper type
* theme-thumbnail.c: (create_metacity_theme_pixbuf): free the metacity
theme after use (bug #469531)
2007-08-21 Jens Granseuer <jensgr@gmx.net>
* gnome-theme-info.c: (gnome_theme_info_find_by_type_helper):

View file

@ -1710,7 +1710,7 @@ gnome_theme_is_writable (const gpointer theme, GnomeThemeType type) {
theme_path = ((const GnomeThemeIconInfo *) theme)->path;
break;
case GNOME_THEME_TYPE_CURSOR:
theme_path = ((const GnomeThemeIconInfo *) theme)->path;
theme_path = ((const GnomeThemeCursorInfo *) theme)->path;
break;
case GNOME_THEME_TYPE_METATHEME:
theme_path = ((const GnomeThemeMetaInfo *) theme)->path;

View file

@ -487,6 +487,7 @@ create_metacity_theme_pixbuf (ThemeThumbnailData *theme_thumbnail_data)
g_object_unref (pixbuf);
gtk_widget_destroy (window);
meta_theme_free (theme);
return retval;
}