diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 8 | ||||
| -rw-r--r-- | mail/mail-format.c | 3 | ||||
| -rw-r--r-- | mail/mail-identify.c | 26 |
3 files changed, 8 insertions, 29 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 805e785a98..2be1b1e017 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,11 @@ +2000-08-12 Dan Winship <danw@helixcode.com> + + * mail-identify.c: Remove workaround for gnome-vfs 0.2 bug. + + * mail-format.c (lookup_handler): Remove workaround for function + introduced between gnome-vfs 0.2 and 0.3, since we depend on 0.3 + now. + 2000-08-12 Michael Meeks <michael@helixcode.com> * main.c (main): kill using_oaf assertion. diff --git a/mail/mail-format.c b/mail/mail-format.c index 4086c5cb0f..05e08f05d1 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -329,8 +329,6 @@ lookup_handler (const char *mime_type, gboolean *generic) return handler_function; } -/* FIXME: Remove this #ifdef after gnome-vfs 0.3 is released */ -#ifdef HAVE_GNOME_VFS_MIME_GET_DEFAULT_ACTION_WITHOUT_FALLBACK action = gnome_vfs_mime_get_default_action_without_fallback (mime_type); if (action) { if (action->action_type == GNOME_VFS_MIME_ACTION_TYPE_COMPONENT) @@ -346,7 +344,6 @@ lookup_handler (const char *mime_type, gboolean *generic) *generic = FALSE; return handler_function; } -#endif handler_function = g_hash_table_lookup (mime_fallback_table, mime_type); diff --git a/mail/mail-identify.c b/mail/mail-identify.c index 91c4efd5d7..e8d82cb8f5 100644 --- a/mail/mail-identify.c +++ b/mail/mail-identify.c @@ -32,20 +32,6 @@ #include <libgnomevfs/gnome-vfs-mime-sniff-buffer.h> #include "mail.h" -/* gnome-vfs 0.2 has a bug that makes memory-based sniff buffers cause - * segfaults sometimes. It's fixed in CVS, but we'll work around it for - * now until gnome-vfs 0.3 comes out. - */ -#define GNOME_VFS_0_2_WORKAROUND - -#ifdef GNOME_VFS_0_2_WORKAROUND -#include <libgnomevfs/gnome-vfs-mime-sniff-buffer-private.h> - -static GnomeVFSResult sniffer_seek (gpointer context, - GnomeVFSSeekPosition whence, - GnomeVFSFileOffset offset); -#endif - /** * mail_identify_mime_part: * @part: a CamelMimePart @@ -94,9 +80,6 @@ mail_identify_mime_part (CamelMimePart *part) if (ba->len) { sniffer = gnome_vfs_mime_sniff_buffer_new_from_memory ( ba->data, ba->len); -#ifdef GNOME_VFS_0_2_WORKAROUND - sniffer->seek = sniffer_seek; -#endif type = gnome_vfs_get_mime_type_for_buffer (sniffer); gnome_vfs_mime_sniff_buffer_free (sniffer); } else @@ -116,12 +99,3 @@ mail_identify_mime_part (CamelMimePart *part) /* We give up. */ return NULL; } - -#ifdef GNOME_VFS_0_2_WORKAROUND -static GnomeVFSResult -sniffer_seek (gpointer context, GnomeVFSSeekPosition whence, - GnomeVFSFileOffset offset) -{ - return GNOME_VFS_ERROR_EOF; -} -#endif |