summaryrefslogtreecommitdiff
path: root/gdk-pixbuf
diff options
context:
space:
mode:
authorFelix Riemann <friemann@svn.gnome.org>2007-02-27 19:28:28 +0000
committerFelix Riemann <friemann@src.gnome.org>2007-02-27 19:28:28 +0000
commit07224aa7ba0d4c0c36f5a61103eb68f974bb6737 (patch)
treefe8e2f717158ffb84d00cbbafe3cc3c957a166a4 /gdk-pixbuf
parent1ac5dcd49c8e18f0218a16837cbfa80bd32e8acd (diff)
downloadgtk+-07224aa7ba0d4c0c36f5a61103eb68f974bb6737.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=/trunk/; revision=17361
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 69dcadaa23..0ece5e3ad5 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>
* io-png.c: Don't leak in the error path. (#405539, Daniel Atallah)
diff --git a/gdk-pixbuf/io-ico.c b/gdk-pixbuf/io-ico.c
index 2923c77aeb..04dde32141 100644
--- a/gdk-pixbuf/io-ico.c
+++ b/gdk-pixbuf/io-ico.c
@@ -1211,6 +1211,7 @@ MODULE_ENTRY (ico, fill_info) (GdkPixbufFormat *info)
};
static gchar * mime_types[] = {
"image/x-icon",
+ "image/x-ico",
NULL
};
static gchar * extensions[] = {