diff options
| author | Matthias Clasen <matthiasc@src.gnome.org> | 2008-07-15 16:33:24 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2008-07-15 16:33:24 +0000 |
| commit | 1ea43444be78b1c281dd888ff86eca838ec3c7c2 (patch) | |
| tree | 11cc2cf118f2e1425e38eb705509c43c62dc8c57 /gdk-pixbuf | |
| parent | 2452be453b24b77b90e21dadbc3594a42fa1e1fd (diff) | |
| download | gtk+-1ea43444be78b1c281dd888ff86eca838ec3c7c2.tar.gz | |
test content sniffing capability of gio
svn path=/trunk/; revision=20837
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/ChangeLog | 5 | ||||
| -rw-r--r-- | gdk-pixbuf/gdk-pixbuf-io.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog index 2d6a730ddc..62ed4582c1 100644 --- a/gdk-pixbuf/ChangeLog +++ b/gdk-pixbuf/ChangeLog @@ -1,3 +1,8 @@ +2008-07-15 Matthias Clasen <mclasen@redhat.com> + + * gdk-pixbuf-io.c: Move the check for wheter to use + GIO for sniffing to configure. + 2008-07-14 Matthias Clasen <mclasen@redhat.com> Bug 401985 – Documentation improvement for the diff --git a/gdk-pixbuf/gdk-pixbuf-io.c b/gdk-pixbuf/gdk-pixbuf-io.c index ea6f5293c1..e75fe98863 100644 --- a/gdk-pixbuf/gdk-pixbuf-io.c +++ b/gdk-pixbuf/gdk-pixbuf-io.c @@ -51,11 +51,6 @@ #define SNIFF_BUFFER_SIZE 4096 #define LOAD_BUFFER_SIZE 65536 -#ifndef G_OS_WIN32 -/* GIO doesn't do mime sniffing on Win32, so we need to do our own */ -#define GDK_PIXBUF_USE_GIO_MIME 1 -#endif - #ifndef GDK_PIXBUF_USE_GIO_MIME static gint format_check (GdkPixbufModule *module, guchar *buffer, int size) |