2008-09-12 [colin] 3.5.0cvs103

[claws.git] / src / compose.h

diff --git a/src/compose.h b/src/compose.h
index 3c37d2dc98c8ff5d44314a38d4365135407b3e45..9a51ad6c8f556ca0ef71286b4361e5a3259a3b0a 100644 (file)
--- a/src/compose.h
+++ b/src/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"
@@ -39,7 +38,7 @@ typedef struct _AttachInfo    AttachInfo;
 #include "textview.h"
 #include "folder.h"
 
-#ifdef USE_ASPELL
+#ifdef USE_ENCHANT
 #include "gtkaspell.h"
 #endif
 
@@ -97,7 +96,6 @@ struct _Compose
        Toolbar *toolbar;
        
        GtkWidget *vbox2;
-       GtkSizeGroup *size_group;
 
        /* Header */
        GtkWidget *table_vbox;
@@ -124,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;
@@ -160,6 +158,7 @@ struct _Compose
        gchar   *boundary;
 
        gboolean autowrap;
+       gboolean autoindent;
 
        gboolean use_to;
        gboolean use_cc;
@@ -193,6 +192,7 @@ struct _Compose
        UndoMain *undostruct;
 
        gchar *sig_str;
+       gboolean sig_inserted;
 
        /* external editor */
        gchar      *exteditor_file;
@@ -200,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;
@@ -233,6 +233,8 @@ struct _Compose
        ComposeMode rmode;
        GtkWidget *first_combo;
        GtkWidget *first_entry;
+       
+       GtkUIManager *ui_manager;
 };
 
 struct _AttachInfo
@@ -241,7 +243,7 @@ struct _AttachInfo
        gchar *content_type;
        EncodingType encoding;
        gchar *name;
-       off_t size;
+       goffset size;
 };
 
 typedef enum