X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-mozembed-msg-view.c;h=e13acccb0ed78dba18108d3cd75bc13a171c7b43;hb=d68cbedf16d65a87c290ecee24bb18fe9a1eb359;hp=ed7f5407a34865397b2a6e4b5111cfc3ef264a19;hpb=4a4e446d6461811d75e3f6b62f38bda2b9e4e975;p=modest

diff --git a/src/widgets/modest-mozembed-msg-view.c b/src/widgets/modest-mozembed-msg-view.c
index ed7f540..e13accc 100644
--- a/src/widgets/modest-mozembed-msg-view.c
+++ b/src/widgets/modest-mozembed-msg-view.c
@@ -71,9 +71,9 @@ static gboolean on_fetch_url (GtkWidget *widget, const gchar *uri, TnyStream *st
 			      ModestMozembedMsgView *msg_view);
 static gboolean on_link_hover (GtkWidget *widget, const gchar *uri, ModestMozembedMsgView *msg_view);
 
-#ifdef MAEMO_CHANGES
+#if HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP
 static void     on_tap_and_hold (GtkWidget *widget, gpointer userdata); 
-#endif /*MAEMO_CHANGES*/
+#endif /*HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP*/
 
 /* TnyMimePartView implementation */
 static void modest_msg_view_mp_clear (TnyMimePartView *self);
@@ -176,7 +176,6 @@ struct _ModestMozembedMsgViewPrivate {
 	/* link click management */
 	gchar *last_url;
 
-	TnyHeaderFlags priority_flags;
 };
 
 #define MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -326,13 +325,11 @@ modest_mozembed_msg_view_init (ModestMozembedMsgView *obj)
 	GtkWidget *separator;
 	GtkWidget *main_vbox;
 	GtkWidget *scroll_area;
-	GtkWidget *viewport;
 	GtkWidget *body_box;
 
 	priv = MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE(obj);
 
 	priv->current_zoom = 1.0;
-	priv->priority_flags = 0;
 
 	priv->body_view                 = GTK_WIDGET (g_object_new (MODEST_TYPE_MOZEMBED_MIME_PART_VIEW, NULL));
 	priv->mail_header_view        = GTK_WIDGET(modest_mail_header_view_new (TRUE));
@@ -372,18 +369,19 @@ modest_mozembed_msg_view_init (ModestMozembedMsgView *obj)
 	gtk_box_pack_start (GTK_BOX (main_vbox), body_box, TRUE, TRUE, 0);
 
 	if (priv->body_view) {
-/* 		viewport = gtk_viewport_new (NULL, NULL); */
-/* 		gtk_widget_set_size_request (priv->body_view, -1, 300); */
-/* 		gtk_container_add (GTK_CONTAINER (viewport), priv->body_view); */
-/* 		gtk_widget_show_all (viewport); */
-/* 		scroll_area = modest_scroll_area_new (GTK_WIDGET (obj), viewport); */
-/* 		gtk_container_add (GTK_CONTAINER (frame), scroll_area); */
-
-		gtk_container_add (GTK_CONTAINER (body_box), priv->body_view);
-		scroll_area = NULL;
-		viewport = NULL;
-
-#ifdef MAEMO_CHANGES
+		gtk_widget_set_size_request (priv->body_view, -1, 1000);
+		scroll_area = modest_scroll_area_new (GTK_WIDGET (obj), priv->body_view);
+		gtk_container_add (GTK_CONTAINER (body_box), scroll_area);
+
+/* 		gtk_container_add (GTK_CONTAINER (body_box), priv->body_view); */
+/* 		scroll_area = NULL; */
+
+/* 		scroll_area = gtk_scrolled_window_new (NULL, NULL); */
+/* 		gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_area), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); */
+/* 		gtk_container_add (GTK_CONTAINER (scroll_area), priv->body_view); */
+/* 		gtk_container_add (GTK_CONTAINER (body_box), scroll_area); */
+
+#if HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP
 		gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->body_view), NULL, NULL, 0);
 		g_signal_connect (G_OBJECT (priv->body_view), "tap-and-hold", G_CALLBACK (on_tap_and_hold), obj);
 #endif
@@ -484,7 +482,7 @@ modest_mozembed_msg_view_new (TnyMsg *msg)
 	return GTK_WIDGET(self);
 }
 
-#ifdef MAEMO_CHANGES
+#if HAVE_DECL_GTK_WIDGET_TAP_AND_HOLD_SETUP
 static void
 on_tap_and_hold (GtkWidget *widget,
 		 gpointer data)
@@ -620,7 +618,7 @@ on_fetch_url (GtkWidget *widget, const gchar *uri,
 			result = FALSE;
 		} else {
 			tny_mime_part_decode_to_stream ((TnyMimePart*)part,
-							stream);
+							stream, NULL);
 			g_object_unref (G_OBJECT(part));
 			result = TRUE;
 		}
@@ -746,7 +744,7 @@ get_priority (ModestMozembedMsgView *self)
 
 	priv = MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE (self);
 
-	return priv->priority_flags;
+	return modest_mail_header_view_get_priority (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view));
 }
 
 static void
@@ -757,8 +755,6 @@ set_priority (ModestMozembedMsgView *self, TnyHeaderFlags flags)
 	g_return_if_fail (MODEST_IS_MOZEMBED_MSG_VIEW (self));
 	priv = MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE (self);
 
-	priv->priority_flags = flags & (TNY_HEADER_FLAG_HIGH_PRIORITY);
-
 	modest_mail_header_view_set_priority (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), flags);
 }