summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorFelix Riemann <friemann@svn.gnome.org>2007-02-27 19:25:22 +0000
committerFelix Riemann <friemann@src.gnome.org>2007-02-27 19:25:22 +0000
commiteb0b44f770b9c9ede821d54cf97a79fcb8e8ab5b (patch)
tree1a4cc817646fb1afb2de382e22e9ac0d2064a52c /gdk-pixbuf
parent3e82928d305d47505d5f7b9cc7c11f4d5c05d585 (diff)
downloadgdk-pixbuf-eb0b44f770b9c9ede821d54cf97a79fcb8e8ab5b.tar.gz
Add image/x-ico to supported mime types. Fixes bug #393599.
2007-02-27 Felix Riemann <friemann@svn.gnome.org> * io-ico.c: (fill_info): Add image/x-ico to supported mime types. Fixes bug #393599. svn path=/branches/gtk-2-10/; revision=17360
Diffstat (limited to 'gdk-pixbuf')
-rw-r--r--gdk-pixbuf/ChangeLog5
-rw-r--r--gdk-pixbuf/io-ico.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 4ccc1b10b..18b13d484 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-27 Felix Riemann <friemann@svn.gnome.org>
+
+ * io-ico.c: (fill_info): Add image/x-ico to supported mime types.
+ Fixes bug #393599.
+
2007-02-16 Matthias Clasen <mclasen@redhat.com>
Merged from trunk:
diff --git a/gdk-pixbuf/io-ico.c b/gdk-pixbuf/io-ico.c
index 812683daa..0a6d4fdce 100644
--- a/gdk-pixbuf/io-ico.c
+++ b/gdk-pixbuf/io-ico.c
@@ -1205,6 +1205,7 @@ MODULE_ENTRY (ico, fill_info) (GdkPixbufFormat *info)
};
static gchar * mime_types[] = {
"image/x-icon",
+ "image/x-ico",
NULL
};
static gchar * extensions[] = {