* Added a unique identifier per header

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

diff --git a/src/widgets/modest-msg-view.c b/src/widgets/modest-msg-view.c
index 685b7d2..43185d7 100644 (file)
--- a/src/widgets/modest-msg-view.c
+++ b/src/widgets/modest-msg-view.c
@@ -66,7 +66,11 @@ static gboolean on_link_clicked (GtkWidget *widget, const gchar *uri, ModestMsgV
 static gboolean on_url_requested (GtkWidget *widget, const gchar *uri, GtkHTMLStream *stream,
                                  ModestMsgView *msg_view);
 static gboolean on_link_hover (GtkWidget *widget, const gchar *uri, ModestMsgView *msg_view);
-static void     on_tap_and_hold (GtkWidget *widget, gpointer userdata);
+
+#ifdef MAEMO_CHANGES
+static void     on_tap_and_hold (GtkWidget *widget, gpointer userdata); 
+#endif /*MAEMO_CHANGES*/
+
 
 /* size allocation and drawing handlers */
 static void get_view_allocation (ModestMsgView *msg_view, GtkAllocation *allocation);
@@ -1378,6 +1382,12 @@ modest_msg_view_set_message (ModestMsgView *self, TnyMsg *msg)
                } else {
                        gtk_widget_hide_all (priv->attachments_box);
                }
+
+/*             g_print ("---\nfilename %s\ncontent_location %s\ncontent_id%s\ncontent_type%s\n", */
+/*                      tny_mime_part_get_filename (body), */
+/*                      tny_mime_part_get_content_location (body), */
+/*                      tny_mime_part_get_content_id (body), */
+/*                      tny_mime_part_get_content_type (body)); */
                        
        } else 
                set_empty_message (self);
@@ -1403,9 +1413,16 @@ modest_msg_view_set_message (ModestMsgView *self, TnyMsg *msg)
 TnyMsg*
 modest_msg_view_get_message (ModestMsgView *self)
 {
+       TnyMsg *msg;
+
        g_return_val_if_fail (self, NULL);
+
+       msg = MODEST_MSG_VIEW_GET_PRIVATE(self)->msg;
+
+       if (msg)
+               g_object_ref (msg);
        
-       return MODEST_MSG_VIEW_GET_PRIVATE(self)->msg;
+       return msg;
 }
 
 gboolean 
@@ -1427,7 +1444,6 @@ modest_msg_view_search (ModestMsgView *self, const gchar *search)
                                         search,
                                         FALSE, TRUE, TRUE);
        y_offset = tmp_vadj->value;
-       g_message ("VALUE %f", y_offset);
        gtk_layout_set_vadjustment (GTK_LAYOUT (priv->gtkhtml), vadj);
        g_object_unref (vadj);
 
@@ -1445,12 +1461,13 @@ modest_msg_view_search_next (ModestMsgView *self)
        priv = MODEST_MSG_VIEW_GET_PRIVATE (self);
        result = gtk_html_engine_search_next (GTK_HTML (priv->gtkhtml));
 
+/*
        {
                GtkAdjustment *adj;
 
                adj = gtk_container_get_focus_vadjustment (GTK_CONTAINER (priv->gtkhtml));
-               g_message ("ADJ value %f", adj->value);
        }
+*/
 
        return result;
 }
@@ -1506,3 +1523,15 @@ modest_msg_view_set_priority (ModestMsgView *self, TnyHeaderFlags flags)
 
        modest_mail_header_view_set_priority (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), flags);
 }
+
+GList *
+modest_msg_view_get_selected_attachments (ModestMsgView *self)
+{
+       ModestMsgViewPrivate *priv;
+
+       g_return_val_if_fail (MODEST_IS_MSG_VIEW (self), NULL);
+       priv = MODEST_MSG_VIEW_GET_PRIVATE (self);
+
+       return modest_attachments_view_get_selection (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+       
+}