AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 02:40:11 +00:00
Code Issues Projects Releases Wiki Activity

Remove an accidentally leftover duplicate pixbuf creation. (#314700,

Browse Source 
2005-08-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an
	accidentally leftover duplicate pixbuf creation.  (#314700,
	Kjartan Maraas)
This commit is contained in:
Matthias Clasen 2005-08-29 05:06:18 +00:00 committed by Matthias Clasen
parent acb9a09750
commit 97ef14b224
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2005-08-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an
accidentally leftover duplicate pixbuf creation. (#314700,
Kjartan Maraas)
* gtk/gtksettings.c (settings_update_cursor_theme): Don't
leak the cursor theme name. (#314693, Kjartan Maraas)

4
ChangeLog.pre-2-10
View File

@ -1,5 +1,9 @@
2005-08-29 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkiconcache.c (_gtk_icon_cache_get_icon): Remove an
accidentally leftover duplicate pixbuf creation. (#314700,
Kjartan Maraas)
* gtk/gtksettings.c (settings_update_cursor_theme): Don't
leak the cursor theme name. (#314693, Kjartan Maraas)

2
gtk/gtkiconcache.c
View File

@ -378,8 +378,6 @@ _gtk_icon_cache_get_icon (GtkIconCache *cache,
return NULL;
}
pixbuf = gdk_pixbuf_from_pixdata (&pixdata, FALSE, &error);
pixbuf = gdk_pixbuf_new_from_data (pixdata.pixel_data, GDK_COLORSPACE_RGB,
(pixdata.pixdata_type & GDK_PIXDATA_COLOR_TYPE_MASK) == GDK_PIXDATA_COLOR_TYPE_RGBA,
8, pixdata.width, pixdata.height, pixdata.rowstride,