2008-09-12 [colin] 3.5.0cvs103

[claws.git] / src / compose.h

diff --git a/src/compose.h b/src/compose.h
index 8989e7ca3a3c0362c1e95ed58c24dc01c4b58a11..9a51ad6c8f556ca0ef71286b4361e5a3259a3b0a 100644 (file)
--- a/src/compose.h
+++ b/src/compose.h
@@ -4,7 +4,7 @@
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifndef __COMPOSE_H__
@@ -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"
@@ -37,8 +36,9 @@ typedef struct _AttachInfo    AttachInfo;
 #include "codeconv.h"
 #include "template.h"
 #include "textview.h"
+#include "folder.h"
 
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
 #include "gtkaspell.h"
 #endif
 
@@ -106,6 +106,7 @@ struct _Compose
        /* Attachments */
        GtkWidget *attach_scrwin;
        GtkWidget *attach_clist;
+       GtkWidget *attach_label;
 
        /* Others */
        GtkWidget *savemsg_checkbtn;
@@ -121,14 +122,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;
@@ -157,6 +158,7 @@ struct _Compose
        gchar   *boundary;
 
        gboolean autowrap;
+       gboolean autoindent;
 
        gboolean use_to;
        gboolean use_cc;
@@ -185,10 +187,12 @@ struct _Compose
        GSList *newsgroup_list;
 
        PrefsAccount *account;
+       FolderItem *folder;
 
        UndoMain *undostruct;
 
        gchar *sig_str;
+       gboolean sig_inserted;
 
        /* external editor */
        gchar      *exteditor_file;
@@ -196,7 +200,7 @@ struct _Compose
        GIOChannel *exteditor_ch;
        gint        exteditor_tag;
 
-#if USE_ASPELL
+#if USE_ENCHANT
         /* GNU/aspell spell checker */
         GtkAspell *gtkaspell;
        GtkWidget *aspell_options_menu;
@@ -213,6 +217,13 @@ struct _Compose
        
        GtkTextTag *no_wrap_tag;
        GtkTextTag *no_join_tag;
+       GtkTextTag *signature_tag;
+       GtkTextTag *quote0_tag;
+       GtkTextTag *quote1_tag;
+       GtkTextTag *quote2_tag;
+       GtkTextTag *uri_tag;
+
+       gboolean automatic_break;
        GMutex *mutex;
        gchar *orig_charset;
        gint set_cursor_pos;
@@ -220,6 +231,10 @@ struct _Compose
        gboolean updating;
        gboolean deferred_destroy;
        ComposeMode rmode;
+       GtkWidget *first_combo;
+       GtkWidget *first_entry;
+       
+       GtkUIManager *ui_manager;
 };
 
 struct _AttachInfo
@@ -228,7 +243,7 @@ struct _AttachInfo
        gchar *content_type;
        EncodingType encoding;
        gchar *name;
-       off_t size;
+       goffset size;
 };
 
 typedef enum
@@ -279,7 +294,7 @@ void compose_reflect_prefs_all                      (void);
 void compose_reflect_prefs_pixmap_theme        (void);
 
 void compose_destroy_all                (void);
-void compose_draft                     (gpointer data, guint action);
+gboolean compose_draft                 (gpointer data, guint action);
 void compose_toolbar_cb                        (gint           action, 
                                         gpointer       data);
 void compose_reply_from_messageview    (MessageView    *msgview,