Fix bug 3793: segfault when autocompletion asks for master passphrase

[claws.git] / src / compose.h

diff --git a/src/compose.h b/src/compose.h
index 992989b1adfa9087077b24930b89823d06e24208..fee1956f5103b0200d247183257d028d77e498b9 100644 (file)
--- a/src/compose.h
+++ b/src/compose.h
@@ -136,9 +136,6 @@ struct _Compose
        GtkWidget *scrolledwin;
        GtkWidget *text;
        GtkWidget *from_name;
-#if !GTK_CHECK_VERSION(2,12,0)
-       GtkTooltips *tooltips;
-#endif
 
        GtkWidget *focused_editable;
 
@@ -190,6 +187,7 @@ struct _Compose
        gboolean use_signing;
        gboolean use_encryption;
        gchar *privacy_system;
+       gchar *encdata;
 
        gboolean modified;
 
@@ -215,6 +213,7 @@ struct _Compose
        pid_t       exteditor_pid;
        GIOChannel *exteditor_ch;
        gint        exteditor_tag;
+       GtkWidget  *exteditor_socket;
 
        /* Priority */
        gint priority;
@@ -223,7 +222,7 @@ struct _Compose
        
        gboolean remove_references;
 
-       gint draft_timeout_tag;
+       gint64 draft_timeout_tag;
        
        GtkTextTag *no_wrap_tag;
        GtkTextTag *no_join_tag;
@@ -235,21 +234,30 @@ struct _Compose
 
        gboolean automatic_break;
        GMutex *mutex;
+       gint close_timeout_tag;
        gchar *orig_charset;
        gint set_cursor_pos;
-       
+
        gboolean updating;
        gboolean deferred_destroy;
        ComposeMode rmode;
        GtkWidget *first_combo;
        GtkWidget *first_entry;
-       
+
        GtkUIManager *ui_manager;
+
+       gint folder_update_callback_id;
 #if USE_ENCHANT
         /* GNU/aspell spell checker */
         GtkAspell *gtkaspell;
        GtkWidget *aspell_options_menu;
 #endif
+
+#ifdef USE_LDAP
+       /* List of addressbook ifaces which we disabled, and will
+        * enable in compose_destroy. */
+       GSList *passworded_ldap_servers;
+#endif
 };
 
 struct _AttachInfo
@@ -260,6 +268,7 @@ struct _AttachInfo
        gchar *name;
        goffset size;
        gchar *charset;
+       gboolean insert;
 };
 
 typedef enum
@@ -271,7 +280,7 @@ typedef enum
 } ComposeDraftAction;
 
 /*#warning FIXME_GTK2 */
-/* attache_files will be locale encode */
+/* attach_files will be locale encode */
 Compose *compose_new                   (PrefsAccount   *account,
                                         const gchar    *mailto,
                                         GList          *attach_files);
@@ -296,7 +305,7 @@ Compose *compose_redirect           (PrefsAccount   *account,
 Compose *compose_reedit                        (MsgInfo        *msginfo,
                                         gboolean        batch);
 
-GList *compose_get_compose_list                (void);
+const GList *compose_get_compose_list  (void);
 
 void compose_entry_append              (Compose          *compose,
                                         const gchar      *address,
@@ -341,4 +350,8 @@ void compose_clear_exit_drafts              (void);
 void compose_reopen_exit_drafts                (void);
 void compose_attach_from_list (Compose *compose, GList *file_list, gboolean free_data);
 void compose_check_for_email_account(Compose *compose);
+
+void compose_use_signing(Compose *compose, gboolean use_signing);
+void compose_use_encryption(Compose *compose, gboolean use_encryption);
+
 #endif /* __COMPOSE_H__ */