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 b7eb4168a322f5bd12a6722051e3000c0483f80c..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;
@@ -238,19 +237,27 @@ struct _Compose
        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
@@ -261,6 +268,7 @@ struct _AttachInfo
        gchar *name;
        goffset size;
        gchar *charset;
+       gboolean insert;
 };
 
 typedef enum
@@ -272,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);
@@ -342,6 +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_list_update_folders(FolderItem *old_item, FolderItem *new_item);
+
+void compose_use_signing(Compose *compose, gboolean use_signing);
+void compose_use_encryption(Compose *compose, gboolean use_encryption);
 
 #endif /* __COMPOSE_H__ */