Again, we forward message as attachment if it's an html message (fixes NB#110254)

[modest] / src / widgets / modest-msg-edit-window.h

diff --git a/src/widgets/modest-msg-edit-window.h b/src/widgets/modest-msg-edit-window.h
index c24e30a..a364da0 100644 (file)
--- a/src/widgets/modest-msg-edit-window.h
+++ b/src/widgets/modest-msg-edit-window.h
@@ -32,6 +32,9 @@
 
 #include <tny-msg.h>
 #include <tny-vfs-stream.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <modest-hildon2-window.h>
+#endif
 #include <widgets/modest-window.h>
 
 G_BEGIN_DECLS
@@ -48,12 +51,20 @@ typedef struct _ModestMsgEditWindow      ModestMsgEditWindow;
 typedef struct _ModestMsgEditWindowClass ModestMsgEditWindowClass;
 
 struct _ModestMsgEditWindow {
+#ifdef MODEST_TOOLKIT_HILDON2
+       ModestHildon2Window parent;
+#else
         ModestWindow parent;
+#endif
        /* insert public members, if any */
 };
 
 struct _ModestMsgEditWindowClass {
+#ifdef MODEST_TOOLKIT_HILDON2
+       ModestHildon2WindowClass parent_class;
+#else
        ModestWindowClass parent_class;
+#endif
        /* insert signal callback declarations, eg. */
        /* void (* my_event) (ModestMsgEditWindow* obj); */
 };
@@ -86,6 +97,7 @@ typedef enum {
  */
 typedef struct  {
        gchar *from, *to, *cc, *bcc, *subject, *plain_body, *html_body;
+       gchar *references, *in_reply_to;
        GList *attachments;
        GList *images;
        TnyHeaderFlags priority_flags;
@@ -118,6 +130,7 @@ GType        modest_msg_edit_window_get_type    (void) G_GNUC_CONST;
  * modest_msg_edit_window_new:
  * @msg: a #TnyMsg instance
  * @account_name: the account this message applies to
+ * @mailbox: the mailbox (if any)
  * @preserve_is_rich: if @msg is not rich, open the message as plain text
  * 
  * instantiates a new #ModestMsgEditWindow widget
@@ -126,6 +139,7 @@ GType        modest_msg_edit_window_get_type    (void) G_GNUC_CONST;
  */
 ModestWindow*   modest_msg_edit_window_new         (TnyMsg *msg, 
                                                    const gchar *account_name, 
+                                                   const gchar *mailbox,
                                                    gboolean preserve_is_rich);