Fix bug #2398, "Race when closing compose during drafting"

[claws.git] / src / compose.h

diff --git a/src/compose.h b/src/compose.h
index 0bf8ec0da26db8b74c2e192530911b85d75ada0b..2d08a3b035627217dcf77dac716c8d523abc61cd 100644 (file)
--- a/src/compose.h
+++ b/src/compose.h
@@ -28,16 +28,12 @@ typedef struct _AttachInfo  AttachInfo;
 
 #include "procmsg.h"
 #include "procmime.h"
-#ifndef USE_NEW_ADDRBOOK
-#include "addressbook.h"
-#endif
 #include "prefs_account.h"
 #include "undo.h"
 #include "toolbar.h"
-#include "messageview.h"
 #include "codeconv.h"
 #include "template.h"
-#include "textview.h"
+#include "viewtypes.h"
 #include "folder.h"
 
 #ifdef USE_ENCHANT
@@ -227,7 +223,7 @@ struct _Compose
        
        gboolean remove_references;
 
-       guint draft_timeout_tag;
+       gint draft_timeout_tag;
        
        GtkTextTag *no_wrap_tag;
        GtkTextTag *no_join_tag;
@@ -239,6 +235,7 @@ struct _Compose
 
        gboolean automatic_break;
        GMutex *mutex;
+       gint close_timeout_tag;
        gchar *orig_charset;
        gint set_cursor_pos;