fix 'Follow-up and Reply-to'

[claws.git] / src / compose.h

diff --git a/src/compose.h b/src/compose.h
index ae330beb062bc23ddfe95b34fe7be1d4b63a68bf..38567786c4c264c3b3743325a62260cc2c7049e5 100644 (file)
--- a/src/compose.h
+++ b/src/compose.h
@@ -25,7 +25,6 @@
 #include <gtk/gtkitemfactory.h>
 
 typedef struct _Compose                Compose;
-typedef struct _ComposeToolbar  ComposeToolbar;
 typedef struct _AttachInfo     AttachInfo;
 
 #include "procmsg.h"
@@ -33,6 +32,7 @@ typedef struct _AttachInfo    AttachInfo;
 #include "addressbook.h"
 #include "prefs_account.h"
 #include "undo.h"
+#include "toolbar.h"
 
 #ifdef USE_ASPELL
 #include "gtkaspell.h"
@@ -60,6 +60,9 @@ typedef enum
        COMPOSE_REPLY_TO_ALL,
        COMPOSE_REPLY_TO_ALL_WITH_QUOTE,
        COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE,
+       COMPOSE_REPLY_TO_LIST,
+       COMPOSE_REPLY_TO_LIST_WITH_QUOTE,
+       COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE,
        COMPOSE_FORWARD,
        COMPOSE_FORWARD_AS_ATTACH,
        COMPOSE_FORWARD_INLINE,
@@ -77,14 +80,15 @@ typedef struct {
 
 struct _Compose
 {
+       /* start with window widget don`t change order */
        GtkWidget *window;
        GtkWidget *vbox;
        GtkWidget *menubar;
-       
+
        /* Toolbar handlebox */
        GtkWidget *handlebox;
-       ComposeToolbar *toolbar;
-
+       Toolbar *toolbar;
+       
        GtkWidget *vbox2;
 
        /* Header */
@@ -136,6 +140,8 @@ struct _Compose
 
        MsgInfo *targetinfo;
        MsgInfo *replyinfo;
+       MsgInfo *autosaved_draft;
+       MsgInfo *fwdinfo;
 
        GtkWidget *header_table;
        GSList    *header_list;
@@ -147,7 +153,8 @@ struct _Compose
        gchar   *bcc;
        gchar   *newsgroups;
        gchar   *followup_to;
-       gchar   *mailinglist;
+
+       gchar   *ml_post;
 
        gchar   *inreplyto;
        gchar   *references;
@@ -158,13 +165,15 @@ struct _Compose
        gboolean use_cc;
        gboolean use_bcc;
        gboolean use_replyto;
+       gboolean use_newsgroups;
        gboolean use_followupto;
-       gboolean use_mailinglist;
        gboolean use_attach;
 
        /* privacy settings */
        gboolean use_signing;
        gboolean use_encryption;
+       
+       gint gnupg_mode;
 
        gboolean modified;
 
@@ -177,7 +186,6 @@ struct _Compose
        GSList *newsgroup_list;
 
        PrefsAccount *account;
-       PrefsAccount *orig_account;
 
        UndoMain *undostruct;
 
@@ -198,24 +206,6 @@ struct _Compose
        gchar *redirect_filename;
 };
 
-struct _ComposeToolbar {
-
-       GtkWidget *toolbar;
-
-       GtkWidget *send_btn;
-       GtkWidget *sendl_btn;
-       GtkWidget *draft_btn;
-       GtkWidget *insert_btn;
-       GtkWidget *attach_btn;
-       GtkWidget *sig_btn;
-       GtkWidget *exteditor_btn;
-       GtkWidget *linewrap_btn;
-       GtkWidget *addrbook_btn;
-
-       GSList    *t_action_list;
-       GSList    *t_item_list;
-};
-
 struct _AttachInfo
 {
        gchar *file;
@@ -235,12 +225,13 @@ Compose *compose_new_with_folderitem      (PrefsAccount   *account,
 void compose_followup_and_reply_to     (MsgInfo        *msginfo,
                                         gboolean        quote,
                                         gboolean        to_all,
-                                        gboolean        ignore_replyto,
+                                        gboolean        to_sender,
                                         const gchar    *body);
 void compose_reply                     (MsgInfo        *msginfo,
                                         gboolean        quote,
                                         gboolean        to_all,
-                                        gboolean        ignore_replyto,
+                                        gboolean        to_ml,
+                                        gboolean        to_sender,
                                         const gchar    *body);
 Compose *compose_forward               (PrefsAccount *account,
                                         MsgInfo        *msginfo,
@@ -267,5 +258,8 @@ void compose_reflect_prefs_all                      (void);
 void compose_reflect_prefs_pixmap_theme        (void);
 
 void compose_destroy_all                (void);
+void compose_draft                     (gpointer data);
+void compose_toolbar_cb                        (gint           action, 
+                                        gpointer       data);
 
 #endif /* __COMPOSE_H__ */