toolbar reply refactoring: part 2

[claws.git] / src / compose.h

diff --git a/src/compose.h b/src/compose.h
index 6eed3a48dd2c7a6f781e983a640b58f4e0ba71fa..da18ab9e88b2e6202c09e563c7239f1a76defa1c 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"
@@ -80,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 */
@@ -139,6 +140,8 @@ struct _Compose
 
        MsgInfo *targetinfo;
        MsgInfo *replyinfo;
+       MsgInfo *autosaved_draft;
+       MsgInfo *fwdinfo;
 
        GtkWidget *header_table;
        GSList    *header_list;
@@ -170,8 +173,7 @@ struct _Compose
        gboolean use_signing;
        gboolean use_encryption;
        
-       gint sigmode;
-       gint encmode;
+       gint gnupg_mode;
 
        gboolean modified;
 
@@ -204,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;
@@ -238,16 +222,20 @@ Compose *compose_new                      (PrefsAccount   *account,
 Compose *compose_new_with_folderitem   (PrefsAccount   *account,
                                         FolderItem     *item);
 
+void compose_reply_mode                        (ComposeMode     mode, 
+                                        GSList         *msginfo_list, 
+                                        gchar          *body);
+/* remove */
 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        to_ml,
-                                        gboolean        ignore_replyto,
+                                        gboolean        to_sender,
                                         const gchar    *body);
 Compose *compose_forward               (PrefsAccount *account,
                                         MsgInfo        *msginfo,
@@ -255,6 +243,8 @@ Compose *compose_forward            (PrefsAccount *account,
                                         const gchar    *body);
 Compose *compose_forward_multiple      (PrefsAccount   *account, 
                                         GSList         *msginfo_list);
+/* remove end */
+
 Compose *compose_redirect              (PrefsAccount   *account,
                                         MsgInfo        *msginfo);
 void compose_reedit                    (MsgInfo        *msginfo);
@@ -275,5 +265,7 @@ 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__ */