Changeset 316

Timestamp:

05/15/06 21:35:28

Author:

pvanhoof

Message:

Decoding attachments

Files:

• trunk/libtinymail-camel/tny-msg-mime-part.c (modified) (4 diffs)
• trunk/libtinymail-gnome-desktop/tny-moz-embed-msg-view.c (modified) (2 diffs)
• trunk/libtinymail-gnomevfs/tny-vfs-stream.c (modified) (5 diffs)

trunk/libtinymail-camel/tny-msg-mime-part.c

@@ -117 +117 @@
-camel_stream_format_text (CamelDataWrapper *dw, CamelStream *stream)
-{
+        /* Stolen from evolution, evil evil me!! moehahah */
+
-        CamelStreamFilter *filter_stream;
-        CamelMimeFilterCharset *filter;
-
+ /* I default to UTF-8, like it or not */
-        CamelMimeFilterWindows *windows = NULL;
-
@@ -162 +164 @@
-        if (windows)
-                camel_object_unref(windows);
+
+        return;
-}
-
@@ -168 +172 @@
-tny_msg_mime_part_decode_to_stream (TnyMsgMimePartIface *self, TnyStreamIface *stream)
-{
-        /* TODO: Add a filter (decoder) here */
-
-        TnyMsgMimePartPriv *priv = TNY_MSG_MIME_PART_GET_PRIVATE (self);
@@ -193 +196 @@
-        }
-
-        /* camel_stream_reset (wrapper->stream);
-        camel_stream_write_to_stream (wrapper->stream, cstream); */
-
-        if (camel_content_type_is (wrapper->mime_type, "text", "*"))
-                camel_stream_format_text (wrapper, cstream);
-        else
-                camel_data_wrapper_decode_to_stream (wrapper, cstream);
-
-        /* This should work but doesn't . . .
-        camel_data_wrapper_write_to_stream (wrapper, cstream); */
-
-        camel_object_unref (CAMEL_OBJECT (cstream));

trunk/libtinymail-gnome-desktop/tny-moz-embed-msg-view.c

@@ -216 +216 @@
-
-        /* TODO: Add a filter (decoder) here (depends on encoding) */
-
-        tny_msg_mime_part_iface_decode_to_stream (part, TNY_STREAM_IFACE (stream));
-
@@ -233 +232 @@
-        GtkTreeIter iter;
-
-
+ 
-        {
-                TnyMsgMimePartIface *part;

trunk/libtinymail-gnomevfs/tny-vfs-stream.c

@@ -56 +56 @@
-{
-        GnomeVFSHandle *handle;
+        gboolean eos;
-};
-
@@ -198 +199 @@
-        if (G_LIKELY (res == GNOME_VFS_OK))
-        {
+                priv->eos = FALSE;
-                return (ssize_t)count;
-
-        } else if (G_LIKELY (res == GNOME_VFS_ERROR_EOF))
-        {
-/*TODO: stream->eos = TRUE; Handle this */
-0
+priv->eos = TRUE;
+(ssize_t)count
-        }
-
@@ -225 +227 @@
-
-        res = gnome_vfs_write (priv->handle, buffer, n, &count);
-
-        if (G_LIKELY (res == GNOME_VFS_OK))
-                return (ssize_t)count;
@@ -366 +367 @@
-        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self);
-
+        priv->eos = FALSE;
-        priv->handle = NULL;
-
@@ -385 +387 @@
-}
-
+static gint 
+tny_vfs_flush (TnyStreamIface *self)
+{
+        return 0;
+}
+
+static gboolean 
+tny_vfs_eos (TnyStreamIface *self)
+{
+        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self);
+
+        return priv->eos;
+}
+
+static gint 
+tny_vfs_reset (TnyStreamIface *self)
+{
+        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self);
+        gint retval = -1;
+        GnomeVFSResult res;
+
+        if (priv->handle == NULL) 
+        {
+                errno = EINVAL;
+                return -1;
+        }
+
+        res = gnome_vfs_seek (priv->handle, GNOME_VFS_SEEK_START, 0);
+
+        if (res != GNOME_VFS_OK)
+        {
+                tny_vfs_stream_set_errno (res);
+                retval = -1;
+        }
+
+        return retval;
+}
+
-static void
-tny_stream_iface_init (gpointer g_iface, gpointer iface_data)
-{
-        TnyStreamIfaceClass *klass = (TnyStreamIfaceClass *)g_iface;
+
+        klass->reset_func = tny_vfs_reset;
+        klass->flush_func = tny_vfs_flush;
+        klass->eos_func = tny_vfs_eos;
-
-        klass->read_func = tny_vfs_stream_read;