X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-attachment-view.c;h=2c0d6787633c41f7ca25035f311204f87e998f81;hp=12bb23c43ee557a3e6fba31e113aaba4214a5b55;hb=e374da56f67092cecb1572dd4bee2ca34e0bc04c;hpb=fb1f5d982174b35cd14a85c99952b68c31c6cbc1

diff --git a/src/widgets/modest-attachment-view.c b/src/widgets/modest-attachment-view.c
index 12bb23c..2c0d678 100644
--- a/src/widgets/modest-attachment-view.c
+++ b/src/widgets/modest-attachment-view.c
@@ -37,14 +37,20 @@
 #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>
+
+#define GET_SIZE_BUFFER_SIZE 128
 
 static GObjectClass *parent_class = NULL;
 
-typedef struct _ModestAttachmentViewPriv ModestAttachmentViewPriv;
+typedef struct _ModestAttachmentViewPrivate ModestAttachmentViewPrivate;
 
-struct _ModestAttachmentViewPriv
+struct _ModestAttachmentViewPrivate
 {
 	TnyMimePart *mime_part;
 
@@ -52,7 +58,7 @@ struct _ModestAttachmentViewPriv
 	GtkWidget *filename_view;
 	GtkWidget *size_view;
 
-	guint get_size_idle_id;
+	gboolean detect_size;
 	TnyStream *get_size_stream;
 	guint64 size;
 
@@ -61,11 +67,14 @@ struct _ModestAttachmentViewPriv
 
 };
 
+#ifdef MODEST_TOOLKIT_HILDON2
+#define UNKNOWN_FILE_ICON "filemanager_unknown_file"
+#else
 #define UNKNOWN_FILE_ICON "qgn_list_gene_unknown_file"
-#define GET_SIZE_BUFFER_SIZE 128
+#endif
 
 #define MODEST_ATTACHMENT_VIEW_GET_PRIVATE(o)	\
-	(G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_ATTACHMENT_VIEW, ModestAttachmentViewPriv))
+	(G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_ATTACHMENT_VIEW, ModestAttachmentViewPrivate))
 
 /* TnyMimePartView functions */
 static TnyMimePart *modest_attachment_view_get_part (TnyMimePartView *self);
@@ -86,10 +95,101 @@ static void tny_mime_part_view_init (gpointer g, gpointer iface_data);
 
 
 
-static gboolean get_size_idle_func (gpointer 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;
+	gdk_threads_enter ();
+
+	if (GTK_WIDGET_VISIBLE (view)) {
+		update_size_label (view);
+	}
+
+	gdk_threads_leave ();
+
+	g_object_unref (view);
+
+	return FALSE;
+}
+
+static gpointer
+get_mime_part_size_thread (gpointer thr_user_data)
+{
+	ModestAttachmentView *view =  (ModestAttachmentView *) thr_user_data;
+	ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (view);
+	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));
+	}
+	
+	/* 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->detect_size = detect_size;
+	
+}
+
+void
+modest_attachment_view_set_size (ModestAttachmentView *self, guint64 size)
+{
+	ModestAttachmentViewPrivate *priv;
+
+	g_return_if_fail (MODEST_IS_ATTACHMENT_VIEW (self));
+	priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self);
+
+	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 *
 modest_attachment_view_get_part (TnyMimePartView *self)
@@ -100,7 +200,7 @@ modest_attachment_view_get_part (TnyMimePartView *self)
 static TnyMimePart *
 modest_attachment_view_get_part_default (TnyMimePartView *self)
 {
-	ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self);
+	ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self);
 
 	if (priv->mime_part)
 		return TNY_MIME_PART (g_object_ref (priv->mime_part));
@@ -111,7 +211,7 @@ modest_attachment_view_get_part_default (TnyMimePartView *self)
 static void
 update_filename_request (ModestAttachmentView *self)
 {
-	ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self);
+	ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self);
 	/* gint width, height; */
 	
 	pango_layout_set_text (PANGO_LAYOUT (priv->layout_full_filename), 
@@ -128,54 +228,10 @@ modest_attachment_view_set_part (TnyMimePartView *self, TnyMimePart *mime_part)
 }
 
 
-static gboolean
-get_size_idle_func (gpointer data)
-{	
-	ModestAttachmentView *self = (ModestAttachmentView *) data;
-	ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self);
-	gssize readed_size;
-	gchar read_buffer[GET_SIZE_BUFFER_SIZE];
-	gchar *size_string;
-
-	if (priv->get_size_stream == NULL) {
-		priv->get_size_stream = tny_camel_mem_stream_new ();
-		tny_mime_part_decode_to_stream (priv->mime_part, priv->get_size_stream);
-		tny_stream_reset (priv->get_size_stream);
-		if (tny_stream_is_eos (priv->get_size_stream)) {
-			tny_stream_close (priv->get_size_stream);
-			priv->get_size_stream = tny_mime_part_get_stream (priv->mime_part);
-		}
-	}
-
-	readed_size = tny_stream_read (priv->get_size_stream, read_buffer, GET_SIZE_BUFFER_SIZE);
-	priv->size += readed_size;
-
-	if (tny_stream_is_eos (priv->get_size_stream)) {
-		gchar *display_size;
-
-		gdk_threads_enter ();
-
-		display_size = modest_text_utils_get_display_size (priv->size);
-		size_string = g_strdup_printf (" (%s)", display_size);
-		g_free (display_size);
-		gtk_label_set_text (GTK_LABEL (priv->size_view), size_string);
-		g_free (size_string);
-
-		g_object_unref (priv->get_size_stream);
-
-		gtk_widget_queue_resize (priv->size_view);
-		priv->get_size_stream = NULL;
-		priv->get_size_idle_id = 0;
-
-		gdk_threads_leave ();
-	}
-	return (priv->get_size_stream != NULL);
-}
-
 static void
 modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mime_part)
 {
-	ModestAttachmentViewPriv *priv = NULL;
+	ModestAttachmentViewPrivate *priv = NULL;
 	gchar *filename = NULL;
 	gchar *file_icon_name = NULL;
 	gboolean show_size = FALSE;
@@ -188,41 +244,48 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
 		g_object_unref (priv->mime_part);
 	}
 
-	priv->mime_part = mime_part;
-
-	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;
-	}
+	priv->mime_part = g_object_ref (mime_part);
 
 	priv->size = 0;
 	priv->is_purged = tny_mime_part_is_purged (mime_part);
-	
-	if (priv->is_purged) {
-		filename = g_strdup( tny_mime_part_get_filename (mime_part));
-		if (filename == NULL)
-			filename = g_strdup ("");
-		file_icon_name = modest_platform_get_file_icon_name (NULL, NULL, NULL);
-	} else if (TNY_IS_MSG (mime_part)) {
+
+	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 = g_strdup (tny_mime_part_get_filename (mime_part));
+			if (!filename)
+				filename = tny_header_dup_subject (header);
+			if (filename == NULL || filename[0] == '\0')
 				filename = g_strdup (_("mail_va_no_subject"));
-			file_icon_name = modest_platform_get_file_icon_name (NULL, tny_mime_part_get_content_type (mime_part), NULL);
+			if (priv->is_purged) {
+				file_icon_name = modest_platform_get_file_icon_name (NULL, NULL, 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 {
 		filename = g_strdup (tny_mime_part_get_filename (mime_part));
-		file_icon_name = modest_platform_get_file_icon_name (filename, 
-								     tny_mime_part_get_content_type (mime_part), 
-								     NULL);
-		show_size = 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, modest_tny_mime_part_get_content_type (mime_part), NULL);
+			show_size = TRUE;
+		}
 	}
 
 	if (file_icon_name) {
@@ -246,8 +309,12 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
 
 	gtk_label_set_text (GTK_LABEL (priv->size_view), "");
 
-	if (show_size)
-		priv->get_size_idle_id = g_idle_add ((GSourceFunc) get_size_idle_func, (gpointer) self);
+	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);
+	}
 
 	gtk_widget_queue_draw (GTK_WIDGET (self));
 }
@@ -262,22 +329,15 @@ modest_attachment_view_clear (TnyMimePartView *self)
 static void
 modest_attachment_view_clear_default (TnyMimePartView *self)
 {
-	ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self);
+	ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self);
 
 	if (priv->mime_part != NULL) {
 		g_object_unref (priv->mime_part);
 		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;
 
@@ -301,11 +361,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);
@@ -314,10 +376,16 @@ modest_attachment_view_new (TnyMimePart *mime_part)
 static void
 modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class)
 {
-	ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (instance);
+	ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (instance);
 	PangoContext *context;
 	GtkWidget *box = 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;
 	priv->icon = gtk_image_new ();
 	priv->filename_view = gtk_label_new ("");
@@ -331,9 +399,14 @@ 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);
@@ -353,6 +426,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;
@@ -361,12 +438,7 @@ modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class)
 static void
 modest_attachment_view_finalize (GObject *object)
 {
-	ModestAttachmentViewPriv *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;
-	}
+	ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (object);
 
 	if (priv->get_size_stream != NULL) {
 		g_object_unref (priv->get_size_stream);
@@ -386,7 +458,7 @@ modest_attachment_view_finalize (GObject *object)
 static void
 size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 {
-	ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (widget);
+	ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (widget);
 	gint width, width_diff;
 
 	GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
@@ -426,7 +498,7 @@ modest_attachment_view_class_init (ModestAttachmentViewClass *klass)
 
 	widget_class->size_allocate = size_allocate;
 
-	g_type_class_add_private (object_class, sizeof (ModestAttachmentViewPriv));
+	g_type_class_add_private (object_class, sizeof (ModestAttachmentViewPrivate));
 
 	return;
 }
@@ -436,9 +508,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;
 }