merge new signature handling

svn path=/trunk/; revision=15960

1 files changed, 16 insertions, 7 deletions

diff --git a/mail/mail-account-gui.h b/mail/mail-account-gui.h
index 8410fb93e4..e7bd203caf 100644
--- a/mail/mail-account-gui.h
+++ b/mail/mail-account-gui.h
@@ -36,6 +36,7 @@ extern "C" {
 #include <camel/camel-provider.h>
 
 #include "mail-config.h"
+#include "mail-accounts.h"
 
 typedef struct {
 	GtkOptionMenu *type;
@@ -63,18 +64,26 @@ typedef struct {
 typedef struct {
 	GtkWidget *top;
 	MailConfigAccount *account;
+	MailAccountsDialog *dialog;
 	GladeXML *xml;
 	
 	/* identity */
 	GtkEntry *full_name;
 	GtkEntry *email_address;
 	GtkEntry *organization;
-	GnomeFileEntry *signature;
-	GnomeFileEntry *html_signature;
-	GtkToggleButton *has_html_signature;
-	GtkButton *edit_signature;
-	GtkButton *edit_html_signature;
-	
+
+	/* signatures */
+	GtkWidget *sig_option_text;
+	GtkWidget *sig_option_html;
+	GtkWidget *sig_new_text;
+	GtkWidget *sig_new_html;
+	GtkWidget *sig_edit_text;
+	GtkWidget *sig_edit_html;
+	MailConfigSignature *text_signature;
+	gboolean text_random;
+	MailConfigSignature *html_signature;
+	gboolean html_random;
+
 	/* incoming mail */
 	MailAccountGuiService source;
 	GtkToggleButton *source_auto_check;
@@ -113,7 +122,7 @@ typedef struct {
 } MailAccountGui;
 
 
-MailAccountGui *mail_account_gui_new (MailConfigAccount *account);
+MailAccountGui *mail_account_gui_new (MailConfigAccount *account, MailAccountsDialog *dialog);
 void mail_account_gui_setup (MailAccountGui *gui, GtkWidget *top);
 gboolean mail_account_gui_save (MailAccountGui *gui);
 void mail_account_gui_destroy (MailAccountGui *gui);