* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
-#include <gtk/gtk.h>
+#include <string.h>
#include <gtkhtml/gtkhtml.h>
#include <tny-gtk-text-buffer-stream.h>
-#include <tny-camel-mime-part.h>
-#include <tny-camel-msg.h>
-#include <tny-list.h>
#include <tny-simple-list.h>
+#include <tny-folder.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#include "modest-tny-msg-actions.h"
#include "modest-text-utils.h"
-static gchar *
-quote_msg (TnyMsg* src, const gchar * from, time_t sent_date, gint limit)
+static const gchar *
+get_body_text (TnyMsg *msg, gboolean want_html)
{
TnyStream *stream;
TnyMimePart *body;
GtkTextBuffer *buf;
GtkTextIter start, end;
const gchar *to_quote;
- gchar *quoted;
- body = modest_tny_msg_actions_find_body_part(src, FALSE);
+ body = modest_tny_msg_actions_find_body_part(msg, want_html);
if (!body)
return NULL;
gtk_text_buffer_get_bounds (buf, &start, &end);
to_quote = gtk_text_buffer_get_text (buf, &start, &end, FALSE);
- quoted = modest_text_utils_quote (to_quote, from, sent_date, limit);
g_object_unref (buf);
- return quoted;
-}
-
-
-gchar*
-modest_tny_msg_actions_quote (TnyMsg * self, const gchar * from,
- time_t sent_date, gint limit,
- const gchar * to_quote)
-{
- /* 2 cases: */
-
- /* a) quote text from selection */
- if (to_quote != NULL)
- return modest_text_utils_quote (to_quote, from, sent_date,
- limit);
-
- /* b) try to find a text/plain part in the msg and quote it */
- return quote_msg (self, from, sent_date, limit);
+ return to_quote;
}
-
-
-TnyMimePart *
-modest_tny_msg_actions_find_body_part (TnyMsg *msg, gboolean want_html)
+static TnyMimePart*
+modest_tny_msg_actions_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html)
{
const gchar *mime_type = want_html ? "text/html" : "text/plain";
- TnyMimePart *part;
+ TnyMimePart *part = NULL;
TnyList *parts;
TnyIterator *iter;
return NULL;
parts = TNY_LIST (tny_simple_list_new());
- tny_msg_get_parts ((TnyMsg*)msg, parts);
+ tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
iter = tny_list_create_iterator(parts);
- while (!tny_iterator_is_done(iter)) {
-
- part = TNY_MIME_PART(tny_iterator_get_current (iter));
-
- if (tny_mime_part_content_type_is (part, mime_type) &&
- !tny_mime_part_is_attachment (part)) {
- break;
- }
- part = NULL;
- tny_iterator_next (iter);
+ /* no parts? assume it's single-part message */
+ if (tny_iterator_is_done(iter))
+ return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
+ else {
+ do {
+ const gchar *ct;
+ gchar *content_type;
+ part = TNY_MIME_PART(tny_iterator_get_current (iter));
+
+ /* we need to strdown the content type, because
+ * tny_mime_part_has_content_type does not do it...
+ */
+ ct = tny_mime_part_get_content_type (part);
+ content_type = g_ascii_strdown (ct, strlen(ct));
+
+ if (g_str_has_prefix (content_type, mime_type) &&
+ !tny_mime_part_is_attachment (part)) {
+ g_free (content_type);
+ break;
+ }
+
+ if (g_str_has_prefix(content_type, "multipart")) {
+ part = modest_tny_msg_actions_find_body_part_from_mime_part (part,
+ want_html);
+ g_free (content_type);
+ if (part)
+ break;
+ }
+
+ g_free (content_type);
+ part = NULL;
+ tny_iterator_next (iter);
+
+ } while (!tny_iterator_is_done(iter));
}
-
+
/* did we find a matching part? */
if (part)
g_object_ref (G_OBJECT(part));
* try to find a text/plain part instead
*/
if (!part && want_html)
- return modest_tny_msg_actions_find_body_part (msg, FALSE);
+ return modest_tny_msg_actions_find_body_part_from_mime_part (msg, FALSE);
+ if (!part)
+ g_printerr ("modest: cannot find body part\n");
+
return part ? part : NULL;
}
+TnyMimePart*
+modest_tny_msg_actions_find_body_part (TnyMsg *msg, gboolean want_html)
+{
+ return modest_tny_msg_actions_find_body_part_from_mime_part (TNY_MIME_PART(msg),
+ want_html);
+}
+
TnyMimePart *
modest_tny_msg_actions_find_nth_part (TnyMsg *msg, gint index)
g_return_val_if_fail (index > 0, NULL);
parts = TNY_LIST(tny_simple_list_new());
- tny_msg_get_parts ((TnyMsg*)msg, parts);
+ tny_mime_part_get_parts (TNY_MIME_PART(msg), parts);
iter = tny_list_create_iterator (parts);
part = NULL;
return part;
}
+
+gchar *
+modest_tny_msg_actions_find_body (TnyMsg *msg, gboolean want_html)
+{
+ const gchar *body;
+
+ body = get_body_text (msg, want_html);
+
+ if (body)
+ return g_strdup (body);
+ else
+ return NULL;
+}
projects / modest / blobdiff