Reverted again the gdk_threads_enter/leave sentences:

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

diff --git a/src/widgets/modest-attachment-view.c b/src/widgets/modest-attachment-view.c
index ec3c2ca..c92bbdb 100644 (file)
--- a/src/widgets/modest-attachment-view.c
+++ b/src/widgets/modest-attachment-view.c
@@ -41,11 +41,6 @@
 
 static GObjectClass *parent_class = NULL;
 
-/* /\* signals *\/ */
-/* enum { */
-/*     LAST_SIGNAL */
-/* }; */
-
 typedef struct _ModestAttachmentViewPriv ModestAttachmentViewPriv;
 
 struct _ModestAttachmentViewPriv
@@ -70,8 +65,6 @@ struct _ModestAttachmentViewPriv
 #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);
@@ -135,7 +128,9 @@ modest_attachment_view_set_part (TnyMimePartView *self, TnyMimePart *mime_part)
 
 static gboolean
 get_size_idle_func (gpointer data)
-{
+{      
+       gdk_threads_enter ();
+
        ModestAttachmentView *self = (ModestAttachmentView *) data;
        ModestAttachmentViewPriv *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (self);
        gssize readed_size;
@@ -165,8 +160,9 @@ get_size_idle_func (gpointer data)
                priv->get_size_idle_id = 0;
        }
 
+       gdk_threads_leave ();
+
        return (priv->get_size_stream != NULL);
-       
 }
 
 static void
@@ -175,6 +171,7 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
        ModestAttachmentViewPriv *priv = NULL;
        const 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));
@@ -197,8 +194,11 @@ 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)) {
+               filename = _("TODO: purged file");
+               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);
@@ -212,6 +212,7 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
                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) {
@@ -224,9 +225,10 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
        gtk_label_set_text (GTK_LABEL (priv->filename_view), 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));
 }
@@ -328,7 +330,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 +404,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;