X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-attachment-view.c;h=2e90fb2e9c871e8f0bc7c00aaca6c04355f2a17f;hb=41d0d47774c7ebe7ce63974fbe8daa2cfeab105c;hp=3628204cdeb2c4f548e4974bc7e7f73d5a3d64f0;hpb=b3189f988bc953765fd3cdb325c4dd883ac9f608;p=modest

diff --git a/src/widgets/modest-attachment-view.c b/src/widgets/modest-attachment-view.c
index 3628204..2e90fb2 100644
--- a/src/widgets/modest-attachment-view.c
+++ b/src/widgets/modest-attachment-view.c
@@ -37,11 +37,13 @@
 #include <modest-attachment-view.h>
 #include <modest-platform.h>
 #include <modest-text-utils.h>
+#include <modest-tny-mime-part.h>
 #include <tny-msg.h>
-#include <tny-camel-mem-stream.h>
 #include <modest-mail-operation.h>
 #include <modest-mail-operation-queue.h>
 #include <modest-runtime.h>
+#include <modest-count-stream.h>
+#include <modest-ui-constants.h>
 
 #define GET_SIZE_BUFFER_SIZE 128
 
@@ -57,7 +59,7 @@ struct _ModestAttachmentViewPrivate
 	GtkWidget *filename_view;
 	GtkWidget *size_view;
 
-	guint get_size_idle_id;
+	gboolean detect_size;
 	TnyStream *get_size_stream;
 	guint64 size;
 
@@ -66,7 +68,11 @@ struct _ModestAttachmentViewPrivate
 
 };
 
+#ifdef MODEST_TOOLKIT_HILDON2
+#define UNKNOWN_FILE_ICON "filemanager_unknown_file"
+#else
 #define UNKNOWN_FILE_ICON "qgn_list_gene_unknown_file"
+#endif
 
 #define MODEST_ATTACHMENT_VIEW_GET_PRIVATE(o)	\
 	(G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_ATTACHMENT_VIEW, ModestAttachmentViewPrivate))
@@ -92,22 +98,27 @@ static void tny_mime_part_view_init (gpointer g, gpointer iface_data);
 
 static void update_filename_request (ModestAttachmentView *self);
 
+static void update_size_label (ModestAttachmentView *self)
+{
+	ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self);
+	gchar *size_str;
+	gchar *label_text;
+
+	size_str = modest_text_utils_get_display_size (priv->size);
+	label_text = g_strdup_printf (" (%s)", size_str);
+	g_free (size_str);
+	gtk_label_set_text (GTK_LABEL (priv->size_view), label_text);
+	g_free (label_text);
+}
 
 static gboolean
 idle_get_mime_part_size_cb (gpointer userdata)
 {
 	ModestAttachmentView *view = (ModestAttachmentView *) userdata;
-	ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (view);
-	gchar *size_str;
-	gchar *label_text;
 	gdk_threads_enter ();
 
 	if (GTK_WIDGET_VISIBLE (view)) {
-		size_str = modest_text_utils_get_display_size (priv->size);
-		label_text = g_strdup_printf (" (%s)", size_str);
-		g_free (size_str);
-		gtk_label_set_text (GTK_LABEL (priv->size_view), label_text);
-		g_free (label_text);
+		update_size_label (view);
 	}
 
 	gdk_threads_leave ();
@@ -122,32 +133,63 @@ get_mime_part_size_thread (gpointer thr_user_data)
 {
 	ModestAttachmentView *view =  (ModestAttachmentView *) thr_user_data;
 	ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (view);
-	gchar read_buffer[GET_SIZE_BUFFER_SIZE];
-	TnyStream *stream;
-	gssize readed_size;
-	gssize total = 0;
-
-	stream = tny_camel_mem_stream_new ();
-	tny_mime_part_decode_to_stream (priv->mime_part, stream);
-	tny_stream_reset (stream);
-	if (tny_stream_is_eos (stream)) {
-		tny_stream_close (stream);
-		stream = tny_mime_part_get_stream (priv->mime_part);
+	gsize total = 0;
+	gssize result = 0;
+
+	result = tny_mime_part_decode_to_stream (priv->mime_part, priv->get_size_stream, NULL);
+	total = modest_count_stream_get_count(MODEST_COUNT_STREAM (priv->get_size_stream));
+	if (total == 0) {
+		modest_count_stream_reset_count(MODEST_COUNT_STREAM (priv->get_size_stream));
+		result = tny_mime_part_write_to_stream (priv->mime_part, priv->get_size_stream, NULL);
+		total = modest_count_stream_get_count(MODEST_COUNT_STREAM (priv->get_size_stream));
 	}
 	
-	while (!tny_stream_is_eos (stream)) {
-		readed_size = tny_stream_read (stream, read_buffer, GET_SIZE_BUFFER_SIZE);
-		total += readed_size;
+	/* if there was an error, don't set the size (this is pretty uncommon) */
+	if (result < 0) {
+		g_warning ("%s: error while writing mime part to stream\n", __FUNCTION__);
+	} else {
+		priv->size = (guint64)total;
+		g_idle_add (idle_get_mime_part_size_cb, g_object_ref (view));
 	}
+	g_object_unref (view);
+
+	return NULL;
+}
+
+void
+modest_attachment_view_set_detect_size (ModestAttachmentView *self, gboolean detect_size)
+{
+	ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self);
 
-	priv->size = total;
+	priv->detect_size = detect_size;
+	
+}
 
-	g_idle_add (idle_get_mime_part_size_cb, g_object_ref (view));
+void
+modest_attachment_view_set_size (ModestAttachmentView *self, guint64 size)
+{
+	ModestAttachmentViewPrivate *priv;
 
-	g_object_unref (stream);
-	g_object_unref (view);
+	g_return_if_fail (MODEST_IS_ATTACHMENT_VIEW (self));
+	priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self);
 
-	return NULL;
+	if (!priv->detect_size) {
+		priv->size = size;
+		update_size_label (self);
+	} else {
+		g_assert ("Shouldn't set the size of the attachment view if detect size is enabled");
+	}
+}
+
+guint64
+modest_attachment_view_get_size (ModestAttachmentView *self)
+{
+	ModestAttachmentViewPrivate *priv;
+
+	g_return_val_if_fail (MODEST_IS_ATTACHMENT_VIEW (self), 0);
+	priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self);
+
+	return priv->size;
 }
 
 static TnyMimePart *
@@ -203,7 +245,7 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
 		g_object_unref (priv->mime_part);
 	}
 
-	priv->mime_part = mime_part;
+	priv->mime_part = g_object_ref (mime_part);
 
 	priv->size = 0;
 	priv->is_purged = tny_mime_part_is_purged (mime_part);
@@ -211,25 +253,60 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
 	if (TNY_IS_MSG (mime_part)) {
 		TnyHeader *header = tny_msg_get_header (TNY_MSG (mime_part));
 		if (TNY_IS_HEADER (header)) {
-			filename = g_strdup (tny_header_get_subject (header));
-			if (filename == NULL || filename[0] == '\0')
+			filename = g_strdup (tny_mime_part_get_filename (mime_part));
+			if (!filename)
+				filename = tny_header_dup_subject (header);
+			if (filename == NULL || filename[0] == '\0') {
+				if (filename)
+					g_free (filename);
 				filename = g_strdup (_("mail_va_no_subject"));
-			if (priv->is_purged)
+			}
+			if (priv->is_purged) {
 				file_icon_name = modest_platform_get_file_icon_name (NULL, NULL, NULL);
-			else
-				file_icon_name = 
-					modest_platform_get_file_icon_name (
-						NULL, tny_mime_part_get_content_type (mime_part), NULL);
+			} else {
+				gchar *header_content_type;
+				header_content_type = modest_tny_mime_part_get_content_type (mime_part);
+				if ((g_str_has_prefix (header_content_type, "message/rfc822") ||
+				     g_str_has_prefix (header_content_type, "multipart/") ||
+				     g_str_has_prefix (header_content_type, "text/"))) {
+					file_icon_name = 
+						modest_platform_get_file_icon_name (
+							NULL, tny_mime_part_get_content_type (mime_part), NULL);
+				} else {
+					file_icon_name = 
+						modest_platform_get_file_icon_name (
+							NULL, header_content_type, NULL);
+				}
+				g_free (header_content_type);
+			}
 			g_object_unref (header);
 		}
 	} else {
+		gboolean is_other_body = FALSE;
 		filename = g_strdup (tny_mime_part_get_filename (mime_part));
+		if (filename == NULL) {
+			gchar *description;
+			description = modest_tny_mime_part_get_header_value (mime_part, "Content-Description");
+			if (description) {
+				g_strstrip (description);
+				filename = description;
+			}
+			if (!filename || filename[0] == '\0') {
+				g_free (filename);
+				filename = g_strdup (_("mail_va_no_subject"));
+			}
+			is_other_body = TRUE;
+		}
 		if (priv->is_purged) {
 			file_icon_name = modest_platform_get_file_icon_name (NULL, NULL, NULL);
 		} else {
-			file_icon_name = modest_platform_get_file_icon_name (
-				filename, tny_mime_part_get_content_type (mime_part), NULL);
-			show_size = TRUE;
+			if (is_other_body) {
+				file_icon_name = modest_platform_get_file_icon_name (NULL, "message/rfc822", NULL);
+			} else {
+				file_icon_name = modest_platform_get_file_icon_name (
+					filename, modest_tny_mime_part_get_content_type (mime_part), NULL);
+				show_size = TRUE;
+			}
 		}
 	}
 
@@ -254,9 +331,41 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
 
 	gtk_label_set_text (GTK_LABEL (priv->size_view), "");
 
-	if (show_size) {
-		tny_camel_mem_stream_get_type ();
+	if (show_size && priv->detect_size) {
+		gchar *disposition;
+
+		disposition = modest_tny_mime_part_get_header_value (mime_part, "Content-Disposition");
+		if (disposition) {
+			const gchar *size_tmp;
+			size_tmp = strstr (disposition, "size=");
+			if (size_tmp) size_tmp += strlen("size=");
+			if (size_tmp) {
+				gchar *disposition_value;
+				const gchar *size_end;
+				size_end = strstr (size_tmp, ";");
+				if (size_end == NULL) {
+					disposition_value = g_strdup (size_tmp);
+				} else {
+					disposition_value = g_strndup (size_tmp, size_end - size_tmp);
+				}
+				if (disposition_value && disposition_value[0] != '\0') {
+					priv->size = atoll (disposition_value);
+					if (priv->size != 0) {
+						show_size = FALSE;
+						update_size_label (MODEST_ATTACHMENT_VIEW (self));
+					}
+				}
+				g_free (disposition_value);
+			}
+			
+			g_free (disposition);
+		}
+	}
+
+	if (show_size && priv->detect_size) {
 		g_object_ref (self);
+		if (!priv->get_size_stream)
+			priv->get_size_stream = modest_count_stream_new ();
 		g_thread_create (get_mime_part_size_thread, self, FALSE, NULL);
 	}
 
@@ -280,15 +389,8 @@ modest_attachment_view_clear_default (TnyMimePartView *self)
 		priv->mime_part = NULL;
 	}
 
-	if (priv->get_size_idle_id != 0) {
-		g_source_remove (priv->get_size_idle_id);
-		priv->get_size_idle_id = 0;
-	}
-
-	if (priv->get_size_stream != NULL) {
-		g_object_unref (priv->get_size_stream);
-		priv->get_size_stream = NULL;
-	}
+	if (priv->get_size_stream)
+		modest_count_stream_reset_count(MODEST_COUNT_STREAM (priv->get_size_stream));
 
 	priv->size = 0;
 
@@ -312,11 +414,13 @@ modest_attachment_view_clear_default (TnyMimePartView *self)
  * Return value: a new #ModestAttachmentView instance implemented for Gtk+
  **/
 GtkWidget*
-modest_attachment_view_new (TnyMimePart *mime_part)
+modest_attachment_view_new (TnyMimePart *mime_part, gboolean detect_size)
 {
 	ModestAttachmentView *self = g_object_new (MODEST_TYPE_ATTACHMENT_VIEW, 
 						   NULL);
 
+	modest_attachment_view_set_detect_size (self, detect_size);
+
 	modest_attachment_view_set_part (TNY_MIME_PART_VIEW (self), mime_part);
 
 	return GTK_WIDGET (self);
@@ -328,8 +432,17 @@ modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class)
 	ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (instance);
 	PangoContext *context;
 	GtkWidget *box = NULL;
+	GtkWidget *icon_alignment = NULL;
+
+#ifdef MODEST_TOOLKIT_HILDON2
+	PangoAttrList *attr_list;
+	attr_list = pango_attr_list_new ();
+	pango_attr_list_insert (attr_list, pango_attr_underline_new (PANGO_UNDERLINE_SINGLE));
+#endif
 
 	priv->mime_part = NULL;
+	icon_alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
+	gtk_alignment_set_padding (GTK_ALIGNMENT (icon_alignment), 0, 0, 0, MODEST_MARGIN_DEFAULT);
 	priv->icon = gtk_image_new ();
 	priv->filename_view = gtk_label_new ("");
 	gtk_label_set_line_wrap (GTK_LABEL (priv->filename_view), FALSE);
@@ -342,12 +455,18 @@ modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class)
 	gtk_misc_set_alignment (GTK_MISC (priv->size_view), 0.0, 0.5);
 	gtk_misc_set_alignment (GTK_MISC (priv->filename_view), 0.0, 0.5);
 
-	priv->get_size_idle_id = 0;
+#ifdef MODEST_TOOLKIT_HILDON2
+	gtk_label_set_attributes (GTK_LABEL (priv->filename_view), attr_list);
+	gtk_label_set_attributes (GTK_LABEL (priv->size_view), attr_list);
+#endif
+
 	priv->get_size_stream = NULL;
 	priv->size = 0;
+	priv->detect_size = TRUE;
 
 	box = gtk_hbox_new (FALSE, 0);
-	gtk_box_pack_start (GTK_BOX (box), priv->icon, FALSE, FALSE, 0);
+	gtk_container_add (GTK_CONTAINER (icon_alignment), priv->icon);
+	gtk_box_pack_start (GTK_BOX (box), icon_alignment, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (box), priv->filename_view, TRUE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (box), priv->size_view, FALSE, FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (instance), box);
@@ -364,6 +483,10 @@ modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class)
 	gtk_event_box_set_visible_window (GTK_EVENT_BOX (instance), TRUE);
 	gtk_widget_set_events (GTK_WIDGET (instance), 0);
 
+#ifdef MODEST_TOOLKIT_HILDON2
+	pango_attr_list_unref (attr_list);
+#endif
+
 	GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (instance), GTK_CAN_FOCUS);
 
 	return;
@@ -374,11 +497,6 @@ modest_attachment_view_finalize (GObject *object)
 {
 	ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (object);
 
-	if (priv->get_size_idle_id) {
-		g_source_remove (priv->get_size_idle_id);
-		priv->get_size_idle_id = 0;
-	}
-
 	if (priv->get_size_stream != NULL) {
 		g_object_unref (priv->get_size_stream);
 		priv->get_size_stream = NULL;
@@ -447,9 +565,9 @@ tny_mime_part_view_init (gpointer g, gpointer iface_data)
 {
         TnyMimePartViewIface *klass = (TnyMimePartViewIface *)g;
 
-        klass->get_part_func = modest_attachment_view_get_part;
-        klass->set_part_func = modest_attachment_view_set_part;
-        klass->clear_func = modest_attachment_view_clear;
+        klass->get_part = modest_attachment_view_get_part;
+        klass->set_part = modest_attachment_view_set_part;
+        klass->clear = modest_attachment_view_clear;
 
         return;
 }