2009-12-02 [pawel] 3.7.3cvs27

[claws.git] / src / compose.h

diff --git a/src/compose.h b/src/compose.h
index acaeff9580ccde888e2a59610a9103cebd702cd0..48c5f67390ee765773671ae4e5dd6f888c904adf 100644 (file)
--- a/src/compose.h
+++ b/src/compose.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2009 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,8 +24,7 @@ typedef struct _Compose               Compose;
 typedef struct _AttachInfo     AttachInfo;
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkitemfactory.h>
+#include <gtk/gtk.h>
 
 #include "procmsg.h"
 #include "procmime.h"
@@ -39,7 +38,7 @@ typedef struct _AttachInfo    AttachInfo;
 #include "textview.h"
 #include "folder.h"
 
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
 #include "gtkaspell.h"
 #endif
 
@@ -78,11 +77,23 @@ typedef enum
        COMPOSE_REEDIT
 } ComposeMode;
 
+typedef enum {
+       PREF_ACCOUNT,
+       PREF_FOLDER,
+       PREF_TEMPLATE,
+       PREF_ML,
+       PREF_MAILTO,
+       PREF_NONE
+} ComposePrefType;
+
 typedef struct {
        guint headernum;
        Compose *compose;
        GtkWidget *combo;
        GtkWidget *entry;
+       GtkWidget *button;
+       GtkWidget *hbox;
+       ComposePrefType type;
 } ComposeHeaderEntry;
 
 struct _Compose
@@ -111,7 +122,7 @@ struct _Compose
 
        /* Others */
        GtkWidget *savemsg_checkbtn;
-       GtkWidget *savemsg_entry;
+       GtkWidget *savemsg_combo;
 
        /* Headers notebook */
        GtkWidget *notebook;
@@ -123,14 +134,14 @@ struct _Compose
        GtkWidget *scrolledwin;
        GtkWidget *text;
        GtkWidget *from_name;
+#if !GTK_CHECK_VERSION(2,12,0)
        GtkTooltips *tooltips;
+#endif
 
        GtkWidget *focused_editable;
 
        GtkWidget *popupmenu;
 
-       GtkItemFactory *popupfactory;
-
        GtkWidget *tmpl_menu;
 
        ComposeMode mode;
@@ -145,6 +156,8 @@ struct _Compose
        guint      header_nextrow;
        ComposeHeaderEntry *header_last;
 
+       GHashTable *email_hashtable;
+
        gchar   *replyto;
        gchar   *cc;
        gchar   *bcc;
@@ -159,6 +172,7 @@ struct _Compose
        gchar   *boundary;
 
        gboolean autowrap;
+       gboolean autoindent;
 
        gboolean use_to;
        gboolean use_cc;
@@ -192,6 +206,7 @@ struct _Compose
        UndoMain *undostruct;
 
        gchar *sig_str;
+       gboolean sig_inserted;
 
        /* external editor */
        gchar      *exteditor_file;
@@ -199,12 +214,6 @@ struct _Compose
        GIOChannel *exteditor_ch;
        gint        exteditor_tag;
 
-#if USE_ASPELL
-        /* GNU/aspell spell checker */
-        GtkAspell *gtkaspell;
-       GtkWidget *aspell_options_menu;
-#endif
-
        /* Priority */
        gint priority;
 
@@ -232,6 +241,13 @@ struct _Compose
        ComposeMode rmode;
        GtkWidget *first_combo;
        GtkWidget *first_entry;
+       
+       GtkUIManager *ui_manager;
+#if USE_ENCHANT
+        /* GNU/aspell spell checker */
+        GtkAspell *gtkaspell;
+       GtkWidget *aspell_options_menu;
+#endif
 };
 
 struct _AttachInfo
@@ -281,7 +297,8 @@ GList *compose_get_compose_list             (void);
 
 void compose_entry_append              (Compose          *compose,
                                         const gchar      *address,
-                                        ComposeEntryType  type);
+                                        ComposeEntryType  type,
+                                        ComposePrefType   pref_type);
 
 
 gint compose_send                      (Compose          *compose);
@@ -316,4 +333,5 @@ gboolean compose_close                      (Compose *compose);
 void compose_close_toolbar             (Compose *compose);
 void compose_clear_exit_drafts         (void);
 void compose_reopen_exit_drafts                (void);
+void compose_attach_from_list (Compose *compose, GList *file_list, gboolean free_data);
 #endif /* __COMPOSE_H__ */