diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-08-29 05:05:13 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-08-29 05:05:13 +0000 |
| commit | 47daaa2e8816e415d303732e67f7ad726e72deb5 (patch) | |
| tree | 6d0cdef68181c09285f4817d9512bd46876dd8cb | |
| parent | bd60a8f83991e417ebf834cfb8852381b1f957be (diff) | |
| download | gdk-pixbuf-47daaa2e8816e415d303732e67f7ad726e72deb5.tar.gz | |
Remove an accidentally leftover duplicate pixbuf creation. (#314700,
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)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | gtk/gtkiconcache.c | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -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) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 70394b78c..ca9df5b1a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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) diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c index 2af6958de..d6f685065 100644 --- a/gtk/gtkiconcache.c +++ b/gtk/gtkiconcache.c @@ -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, |