diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2008-07-01 05:23:32 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-07-01 05:23:32 +0000 |
| commit | 56a0748b9ed99c0b5697408129da0b72b3488b91 (patch) | |
| tree | 0e6aab243d2f87d7ae540fdc5664bdf95839e376 | |
| parent | 322e7369a94eb9617989b40a206d96bdafaf2fa2 (diff) | |
| download | gtk+-56a0748b9ed99c0b5697408129da0b72b3488b91.tar.gz | |
Add image/x-win-bitmap to the supported mimetypes, since that is what
2008-06-18 Matthias Clasen <mclasen@redhat.com>
* io-ico.c: Add image/x-win-bitmap to the supported mimetypes,
since that is what shared-mime-info uses for .cur
svn path=/branches/gtk-2-12/; revision=20713
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 7 | ||||
| -rw-r--r-- | gdk-pixbuf/io-ico.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index a1fb63d933..31b3d44186 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,10 @@ +2008-06-18 Matthias Clasen <mclasen@redhat.com> + + Merged from trunk: + + * io-ico.c: Add image/x-win-bitmap to the supported mimetypes, + since that is what shared-mime-info uses for .cur + 2008-06-03 Matthias Clasen <mclasen@redhat.com> * === Released 2.12.10 === diff --git a/gdk-pixbuf/io-ico.c b/gdk-pixbuf/io-ico.c index f25ecec3dc..5a428031db 100644 --- a/gdk-pixbuf/io-ico.c +++ b/gdk-pixbuf/io-ico.c @@ -1210,6 +1210,7 @@ MODULE_ENTRY (ico, fill_info) (GdkPixbufFormat *info) static gchar * mime_types[] = { "image/x-icon", "image/x-ico", + "image/x-win-bitmap", NULL }; static gchar * extensions[] = { |