priv->headers_window = NULL;
priv->html_window = NULL;
-
gtk_widget_push_composite_child ();
priv->html_scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_widget_set_composite_name (priv->html_scroll, "contents");
if (part_cid && strcmp (cid, part_cid) == 0)
break;
- g_object_unref (G_OBJECT(part));
+ if (part)
+ g_object_unref (G_OBJECT(part));
part = NULL;
tny_iterator_next (iter);
gtk_html_load_from_string (GTK_HTML(priv->gtkhtml),
"", 1);
+
return TRUE;
}
return msg;
}
+static gboolean
+has_contents_receiver (gpointer engine, const gchar *data,
+ size_t len, gboolean *has_contents)
+{
+ if (len > 1 || ((len == 1)&&(data[0]!='\n'))) {
+ *has_contents = TRUE;
+ return FALSE;
+ }
+ return TRUE;
+}
+
+gboolean
+modest_msg_view_get_message_is_empty (ModestMsgView *self)
+{
+ /* TODO: Find some gtkhtml API to check whether there is any (visible, non markup)
+ * text in the message:
+ */
+ ModestMsgViewPrivate *priv = MODEST_MSG_VIEW_GET_PRIVATE (self);
+ gboolean has_contents = FALSE;
+
+ gtk_html_export (GTK_HTML (priv->gtkhtml), "text/plain",
+ (GtkHTMLSaveReceiverFn) has_contents_receiver, &has_contents);
+
+ return !has_contents;
+}
+
+
gboolean
modest_msg_view_search (ModestMsgView *self, const gchar *search)
{
result = gtk_html_engine_search (GTK_HTML (priv->gtkhtml),
search,
FALSE, TRUE, TRUE);
+
+// wait for the updated gtkhtml (w27) to enable this
+#if 0
+ if (result) {
+ gint x, y, w, h;
+ gdouble offset_top, offset_bottom;
+ GtkAdjustment *adj;
+ gtk_html_get_selection_area (GTK_HTML (priv->gtkhtml), &x, &y, &w, &h);
+ offset_top = (gdouble) (priv->headers_box->requisition.height + y);
+ offset_bottom = (gdouble) (priv->headers_box->requisition.height + y + h);
+ adj = GTK_ADJUSTMENT (priv->vadj);
+ if (offset_top < adj->value)
+ gtk_adjustment_set_value (adj, offset_top + adj->page_increment - adj->page_size);
+ else if (offset_bottom > adj->value + adj->page_increment)
+ gtk_adjustment_set_value (adj, offset_bottom - adj->page_increment);
+ }
+#endif
+
y_offset = tmp_vadj->value;
gtk_layout_set_vadjustment (GTK_LAYOUT (priv->gtkhtml), vadj);
g_object_unref (vadj);
priv = MODEST_MSG_VIEW_GET_PRIVATE (self);
result = gtk_html_engine_search_next (GTK_HTML (priv->gtkhtml));
-/*
- {
+// fixme wait for new gtkhtml
+#if 0
+ if (result) {
+ gint x, y, w, h;
+ gdouble offset_top, offset_bottom;
GtkAdjustment *adj;
-
- adj = gtk_container_get_focus_vadjustment (GTK_CONTAINER (priv->gtkhtml));
+ gtk_html_get_selection_area (GTK_HTML (priv->gtkhtml), &x, &y, &w, &h);
+ g_message ("SELECTION AREA x%d y%d w%d h%d", x, y, w, h);
+ offset_top = (gdouble) (priv->headers_box->requisition.height + y);
+ offset_bottom = (gdouble) (priv->headers_box->requisition.height + y + h);
+ adj = GTK_ADJUSTMENT (priv->vadj);
+ if (offset_top < adj->value)
+ gtk_adjustment_set_value (adj, offset_top + adj->page_increment - adj->page_size);
+ else if (offset_bottom > adj->value + adj->page_increment)
+ gtk_adjustment_set_value (adj, offset_bottom - adj->page_increment);
}
-*/
-
+#endif
return result;
}
}
+GList *
+modest_msg_view_get_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_attachments (MODEST_ATTACHMENTS_VIEW (priv->attachments_view));
+
+}
+
void
modest_msg_view_grab_focus (ModestMsgView *view)
{
gtk_widget_grab_focus (priv->gtkhtml);
}
+
+void
+modest_msg_view_remove_attachment (ModestMsgView *view, TnyMimePart *attachment)
+{
+ TnyMsg *msg;
+ ModestMsgViewPrivate *priv;
+
+ g_return_if_fail (MODEST_IS_MSG_VIEW (view));
+ g_return_if_fail (TNY_IS_MIME_PART (attachment));
+ priv = MODEST_MSG_VIEW_GET_PRIVATE (view);
+
+ msg = modest_msg_view_get_message (view);
+ modest_attachments_view_remove_attachment (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+ attachment);
+
+}