Changeset 3387

Timestamp:

02/09/08 13:09:17

Author:

pvanhoof

Message:

• • • • Added a tny_mime_part_get_decoded_stream API
        

• • • • This was a minor API change
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-mime-part.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-mime-part.h (modified) (1 diff)
• trunk/libtinymail/tny-mime-part.c (modified) (1 diff)
• trunk/libtinymail/tny-mime-part.h (modified) (2 diffs)

trunk/ChangeLog

@@ -5 +5 @@
-        * Various smaller fixes and code improvements
-        * Has-attachment status detection improvement
+        * Added a tny_mime_part_get_decoded_stream API
+
+        * This was a minor API change
-
-2008-02-05  Philip Van Hoof <pvanhoof@gnome.org>

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

@@ -63 +63 @@
-#include <camel/camel-mime-filter-windows.h>
-
+static ssize_t camel_stream_format_text (CamelDataWrapper *dw, CamelStream *stream);
+
-static void 
-tny_camel_mime_part_set_header_pair (TnyMimePart *self, const gchar *name, const gchar *value)
@@ -277 +279 @@
-        TnyIterator *iter;
-        const gchar *type = tny_mime_part_get_content_type (orig);
-
+decoded_
-/*
-        TnyList *header_pairs = tny_simple_list_new ();
@@ -827 +829 @@
-        return retval;
-}
+
+
+
+
+static TnyStream* 
+tny_camel_mime_part_get_decoded_stream (TnyMimePart *self)
+{
+        return TNY_CAMEL_MIME_PART_GET_CLASS (self)->get_decoded_stream(self);
+}
+
+static TnyStream* 
+tny_camel_mime_part_get_decoded_stream_default (TnyMimePart *self)
+{
+        TnyCamelMimePartPriv *priv = TNY_CAMEL_MIME_PART_GET_PRIVATE (self);
+        TnyStream *retval = NULL;
+        CamelDataWrapper *wrapper;
+        CamelMedium *medium;
+        CamelStream *stream = camel_stream_mem_new ();
+
+        g_mutex_lock (priv->part_lock);
+        medium =  CAMEL_MEDIUM (priv->part);
+        camel_object_ref (medium);
+        g_mutex_unlock (priv->part_lock);
+
+        wrapper = camel_medium_get_content_object (medium);
+
+        if (!wrapper) {
+                wrapper = camel_data_wrapper_new (); 
+                camel_medium_set_content_object (medium, wrapper);
+                camel_object_unref (wrapper);
+        } 
+
+        if (wrapper->stream) {
+                camel_stream_reset (wrapper->stream);
+
+                if (camel_content_type_is (wrapper->mime_type, "text", "*"))
+                        camel_stream_format_text (wrapper, stream);
+                else
+                        camel_data_wrapper_decode_to_stream (wrapper, stream);
+        }
+
+        retval = TNY_STREAM (tny_camel_stream_new (stream));
+        camel_object_unref (stream);
+
+        tny_stream_reset (retval);
+        camel_object_unref (medium);
+
+        return retval;
+}
+
-
-static const gchar* 

trunk/libtinymail-camel/tny-camel-mime-part.h

@@ -53 +53 @@
-        gboolean (*content_type_is) (TnyMimePart *self, const gchar *content_type);
-        TnyStream* (*get_stream) (TnyMimePart *self);
+        TnyStream* (*get_decoded_stream) (TnyMimePart *self);
-        gssize (*decode_to_stream) (TnyMimePart *self, TnyStream *stream, GError **err);
-        gssize (*write_to_stream) (TnyMimePart *self, TnyStream *stream, GError **err);

trunk/libtinymail/tny-mime-part.c

@@ -868 +868 @@
-}
-
+
+
+/**
+ * tny_mime_part_get_decoded_stream:
+ * @self: a #TnyMimePart
+ * 
+ * Inefficiently get a stream for @self. The entire data of the part will be
+ * kept in memory until the returned value is unreferenced.
+ *
+ * returns: an in-memory stream
+ * since: 1.0
+ * audience: application-developer
+ **/
+TnyStream* 
+tny_mime_part_get_decoded_stream (TnyMimePart *self)
+{
+        TnyStream *retval;
+
+#ifdef DBC /* require */
+        g_assert (TNY_IS_MIME_PART (self));
+        g_assert (TNY_MIME_PART_GET_IFACE (self)->get_decoded_stream!= NULL);
+#endif
+
+        retval = TNY_MIME_PART_GET_IFACE (self)->get_decoded_stream(self);
+
+#ifdef DBC /* ensure */
+        g_assert (TNY_IS_STREAM (retval));
+#endif
+
+        return retval;
+}
+
-/**
- * tny_mime_part_get_content_type:

trunk/libtinymail/tny-mime-part.h

@@ -47 +47 @@
-        gboolean (*content_type_is) (TnyMimePart *self, const gchar *content_type);
-        TnyStream* (*get_stream) (TnyMimePart *self);
+        TnyStream* (*get_decoded_stream) (TnyMimePart *self);
-        gssize (*decode_to_stream) (TnyMimePart *self, TnyStream *stream, GError **err);
-        gssize (*write_to_stream) (TnyMimePart *self, TnyStream *stream, GError **err);
@@ -79 +80 @@
-gboolean tny_mime_part_content_type_is (TnyMimePart *self, const gchar *type);
-TnyStream* tny_mime_part_get_stream (TnyMimePart *self);
+TnyStream* tny_mime_part_get_decoded_stream (TnyMimePart *self);
-gssize tny_mime_part_write_to_stream (TnyMimePart *self, TnyStream *stream, GError **err);
-gint tny_mime_part_construct (TnyMimePart *self, TnyStream *stream, const gchar *mime_type, const gchar *transfer_encoding);