X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-attachment-view.c;h=2fedbf3094c285e6395e577ccc1e409e2e968dbf;hp=ec3c2cafdedd9c9677353f1be81e466becdd976c;hb=f2f85fb554572fa18695ab7b60c6143347c92d92;hpb=57ef4a349b509830747019c4af405f8a91892412 diff --git a/src/widgets/modest-attachment-view.c b/src/widgets/modest-attachment-view.c index ec3c2ca..2fedbf3 100644 --- a/src/widgets/modest-attachment-view.c +++ b/src/widgets/modest-attachment-view.c @@ -38,14 +38,13 @@ #include #include #include +#include +#include +#include +#include static GObjectClass *parent_class = NULL; -/* /\* signals *\/ */ -/* enum { */ -/* LAST_SIGNAL */ -/* }; */ - typedef struct _ModestAttachmentViewPriv ModestAttachmentViewPriv; struct _ModestAttachmentViewPriv @@ -61,17 +60,15 @@ struct _ModestAttachmentViewPriv guint64 size; PangoLayout *layout_full_filename; + gboolean is_purged; }; #define UNKNOWN_FILE_ICON "qgn_list_gene_unknown_file" -#define GET_SIZE_BUFFER_SIZE 128 #define MODEST_ATTACHMENT_VIEW_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_ATTACHMENT_VIEW, ModestAttachmentViewPriv)) -/* static guint signals[LAST_SIGNAL] = {0}; */ - /* TnyMimePartView functions */ static TnyMimePart *modest_attachment_view_get_part (TnyMimePartView *self); static TnyMimePart *modest_attachment_view_get_part_default (TnyMimePartView *self); @@ -91,9 +88,32 @@ 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 get_mime_part_size_cb (ModestMailOperation *mail_op, + gssize size, + gpointer userdata); + + +static void +get_mime_part_size_cb (ModestMailOperation *mail_op, + gssize size, + gpointer userdata) +{ + ModestAttachmentView *att_view = MODEST_ATTACHMENT_VIEW (userdata); + ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (att_view); + gchar *size_str; + gchar *label_text; + + if (GTK_WIDGET_VISIBLE (att_view)) { + size_str = modest_text_utils_get_display_size (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 TnyMimePart * @@ -133,48 +153,13 @@ 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_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; - - 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; - } - - return (priv->get_size_stream != NULL); - -} - static void modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mime_part) { ModestAttachmentViewPriv *priv = NULL; - const gchar *filename = NULL; + gchar *filename = NULL; gchar *file_icon_name = NULL; + gboolean show_size = FALSE; g_return_if_fail (TNY_IS_MIME_PART_VIEW (self)); g_return_if_fail (TNY_IS_MIME_PART (mime_part)); @@ -186,32 +171,32 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim 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->size = 0; + priv->is_purged = tny_mime_part_is_purged (mime_part); if (TNY_IS_MSG (mime_part)) { TnyHeader *header = tny_msg_get_header (TNY_MSG (mime_part)); if (TNY_IS_HEADER (header)) { - filename = tny_header_get_subject (header); + filename = g_strdup (tny_header_get_subject (header)); if (filename == NULL) - filename = _("mail_va_no_subject"); - file_icon_name = modest_platform_get_file_icon_name (NULL, tny_mime_part_get_content_type (mime_part), NULL); + filename = g_strdup (_("mail_va_no_subject")); + 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); g_object_unref (header); } } else { - filename = 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); + filename = g_strdup (tny_mime_part_get_filename (mime_part)); + 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 (file_icon_name) { @@ -221,12 +206,28 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon), UNKNOWN_FILE_ICON, GTK_ICON_SIZE_MENU); } - gtk_label_set_text (GTK_LABEL (priv->filename_view), filename); + if (priv->is_purged) { + gchar * label_str = g_markup_printf_escaped( + "%s", + filename); + gtk_label_set_markup (GTK_LABEL (priv->filename_view), label_str); + g_free (label_str); + } else { + gtk_label_set_text (GTK_LABEL (priv->filename_view), filename); + } + g_free (filename); update_filename_request (MODEST_ATTACHMENT_VIEW (self)); - gtk_label_set_text (GTK_LABEL (priv->size_view), " "); + gtk_label_set_text (GTK_LABEL (priv->size_view), ""); - priv->get_size_idle_id = g_idle_add ((GSourceFunc) get_size_idle_func, (gpointer) self); + if (show_size) { + ModestMailOperation *mail_op = + modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_INFO, G_OBJECT (self)); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); + modest_mail_operation_get_mime_part_size (mail_op, mime_part, get_mime_part_size_cb, + self, NULL); + g_object_unref (mail_op); + } gtk_widget_queue_draw (GTK_WIDGET (self)); } @@ -328,7 +329,9 @@ modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class) pango_layout_set_ellipsize (priv->layout_full_filename, PANGO_ELLIPSIZE_NONE); - gtk_event_box_set_above_child (GTK_EVENT_BOX (instance), TRUE); + gtk_event_box_set_above_child (GTK_EVENT_BOX (instance), FALSE); + gtk_event_box_set_visible_window (GTK_EVENT_BOX (instance), TRUE); + gtk_widget_set_events (GTK_WIDGET (instance), 0); GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (instance), GTK_CAN_FOCUS); @@ -400,7 +403,6 @@ modest_attachment_view_class_init (ModestAttachmentViewClass *klass) klass->get_part_func = modest_attachment_view_get_part_default; klass->set_part_func = modest_attachment_view_set_part_default; klass->clear_func = modest_attachment_view_clear_default; - klass->activate = NULL; widget_class->size_allocate = size_allocate;