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 a3abd710002a6d55abb05f2d9cdb3308fdf2a370..2d08a3b035627217dcf77dac716c8d523abc61cd 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-2009 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2012 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
@@ -28,14 +28,12 @@ typedef struct _AttachInfo  AttachInfo;
 
 #include "procmsg.h"
 #include "procmime.h"
-#include "addressbook.h"
 #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
@@ -225,7 +223,7 @@ struct _Compose
        
        gboolean remove_references;
 
-       guint draft_timeout_tag;
+       gint draft_timeout_tag;
        
        GtkTextTag *no_wrap_tag;
        GtkTextTag *no_join_tag;
@@ -237,6 +235,7 @@ struct _Compose
 
        gboolean automatic_break;
        GMutex *mutex;
+       gint close_timeout_tag;
        gchar *orig_charset;
        gint set_cursor_pos;
        
@@ -261,6 +260,7 @@ struct _AttachInfo
        EncodingType encoding;
        gchar *name;
        goffset size;
+       gchar *charset;
 };
 
 typedef enum
@@ -275,7 +275,7 @@ typedef enum
 /* attache_files will be locale encode */
 Compose *compose_new                   (PrefsAccount   *account,
                                         const gchar    *mailto,
-                                        GPtrArray      *attach_files);
+                                        GList          *attach_files);
 
 Compose *compose_new_with_folderitem   (PrefsAccount   *account,
                                         FolderItem     *item,