2008-08-21 [colin] 3.5.0cvs67

[claws.git] / src / compose.h

diff --git a/src/compose.h b/src/compose.h
index 5fe568cb4b93f1ef11d71aea5941c11052518e77..3a26db9d7c5bfb1a1e0dc5644b220d000c50cfe1 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"
@@ -123,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;
@@ -159,6 +158,7 @@ struct _Compose
        gchar   *boundary;
 
        gboolean autowrap;
+       gboolean autoindent;
 
        gboolean use_to;
        gboolean use_cc;
@@ -192,6 +192,7 @@ struct _Compose
        UndoMain *undostruct;
 
        gchar *sig_str;
+       gboolean sig_inserted;
 
        /* external editor */
        gchar      *exteditor_file;
@@ -232,6 +233,8 @@ struct _Compose
        ComposeMode rmode;
        GtkWidget *first_combo;
        GtkWidget *first_entry;
+       
+       GtkUIManager *ui_manager;
 };
 
 struct _AttachInfo
@@ -240,7 +243,7 @@ struct _AttachInfo
        gchar *content_type;
        EncodingType encoding;
        gchar *name;
-       off_t size;
+       goffset size;
 };
 
 typedef enum