* unitialize modest-window-mgr before the other singletons, so

[modest] / src / widgets / modest-attachment-view.c

diff --git a/src/widgets/modest-attachment-view.c b/src/widgets/modest-attachment-view.c
index 13a0dbd..6eebfe6 100644 (file)
--- a/src/widgets/modest-attachment-view.c
+++ b/src/widgets/modest-attachment-view.c
@@ -128,7 +128,7 @@ 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;
@@ -145,6 +145,8 @@ get_size_idle_func (gpointer data)
        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);
@@ -156,18 +158,19 @@ get_size_idle_func (gpointer data)
                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;
-       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));
@@ -190,21 +193,28 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
        }
 
        priv->size = 0;
-
-       if (TNY_IS_MSG (mime_part)) {
+       
+       if (tny_mime_part_is_purged (mime_part)) {
+               const gchar *real_filename = tny_mime_part_get_filename (mime_part);
+               if (real_filename == NULL)
+                       real_filename = "";
+               filename = g_strdup_printf (_("FIXME: Purged %s"), real_filename);
+               file_icon_name = modest_platform_get_file_icon_name (NULL, NULL, NULL);
+       } else 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");
+                               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);
                        g_object_unref (header);
                }
        } else {
-               filename = tny_mime_part_get_filename (mime_part);
+               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 (file_icon_name) {
@@ -215,11 +225,13 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
        }
 
        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)
+               priv->get_size_idle_id = g_idle_add ((GSourceFunc) get_size_idle_func, (gpointer) self);
 
        gtk_widget_queue_draw (GTK_WIDGET (self));
 }
@@ -321,7 +333,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);