Add a "don't sign meeting requests" option to the security pane, since

	* mail-config.glade: Add a "don't sign meeting requests" option to
	the security pane, since some versions of Outlook won't recognize
	pgp-signed meeting requests. Sigh.

	* mail-config.c (account_copy, config_read, mail_config_write):
	Handle pgp_no_imip_sign.

	* mail-account-gui.c (mail_account_gui_new,
	mail_account_gui_save): Setup/save "don't sign meeting requests"
	button.

svn path=/trunk/; revision=17778

6 files changed, 42 insertions, 0 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 4dd02ce563..077a9475ce 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,16 @@
+2002-08-14  Dan Winship  <danw@ximian.com>
+
+	* mail-config.glade: Add a "don't sign meeting requests" option to
+	the security pane, since some versions of Outlook won't recognize
+	pgp-signed meeting requests. Sigh.
+
+	* mail-config.c (account_copy, config_read, mail_config_write):
+	Handle pgp_no_imip_sign.
+
+	* mail-account-gui.c (mail_account_gui_new,
+	mail_account_gui_save): Setup/save "don't sign meeting requests"
+	button.
+
 2002-08-13  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* mail-callbacks.c (forward_message): Removed an unused variable.
diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c
index aa92c54a78..03eb632fd9 100644
--- a/mail/mail-account-gui.c
+++ b/mail/mail-account-gui.c
@@ -1503,6 +1503,8 @@ mail_account_gui_new (MailConfigAccount *account, MailAccountsTab *dialog)
 	gtk_toggle_button_set_active (gui->pgp_encrypt_to_self, account->pgp_encrypt_to_self);
 	gui->pgp_always_sign = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui->xml, "pgp_always_sign"));
 	gtk_toggle_button_set_active (gui->pgp_always_sign, account->pgp_always_sign);
+	gui->pgp_no_imip_sign = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui->xml, "pgp_no_imip_sign"));
+	gtk_toggle_button_set_active (gui->pgp_no_imip_sign, account->pgp_no_imip_sign);
 	gui->pgp_always_trust = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui->xml, "pgp_always_trust"));
 	gtk_toggle_button_set_active (gui->pgp_always_trust, account->pgp_always_trust);
 	
@@ -1926,6 +1928,7 @@ mail_account_gui_save (MailAccountGui *gui)
 	account->pgp_key = e_utf8_gtk_entry_get_text (gui->pgp_key);
 	account->pgp_encrypt_to_self = gtk_toggle_button_get_active (gui->pgp_encrypt_to_self);
 	account->pgp_always_sign = gtk_toggle_button_get_active (gui->pgp_always_sign);
+	account->pgp_no_imip_sign = gtk_toggle_button_get_active (gui->pgp_no_imip_sign);
 	account->pgp_always_trust = gtk_toggle_button_get_active (gui->pgp_always_trust);
 	
 #if defined (HAVE_NSS) && defined (SMIME_SUPPORTED)
diff --git a/mail/mail-account-gui.h b/mail/mail-account-gui.h
index 76557c0781..451f16da3e 100644
--- a/mail/mail-account-gui.h
+++ b/mail/mail-account-gui.h
@@ -107,6 +107,7 @@ typedef struct {
 	GtkEntry *pgp_key;
 	GtkToggleButton *pgp_encrypt_to_self;
 	GtkToggleButton *pgp_always_sign;
+	GtkToggleButton *pgp_no_imip_sign;
 	GtkToggleButton *pgp_always_trust;
 	GtkEntry *smime_key;
 	GtkToggleButton *smime_encrypt_to_self;
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 0db4017ad8..4e28486af8 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -268,6 +268,7 @@ account_copy (const MailConfigAccount *account)
 	new->pgp_key = g_strdup (account->pgp_key);
 	new->pgp_encrypt_to_self = account->pgp_encrypt_to_self;
 	new->pgp_always_sign = account->pgp_always_sign;
+	new->pgp_no_imip_sign = account->pgp_no_imip_sign;
 	new->pgp_always_trust = account->pgp_always_trust;
 	
 	new->smime_key = g_strdup (account->smime_key);
@@ -689,6 +690,11 @@ config_read (void)
 		        config->db, path, FALSE, NULL);
 		g_free (path);
 		
+		path = g_strdup_printf ("/Mail/Accounts/account_pgp_no_imip_sign_%d", i);
+		account->pgp_no_imip_sign = bonobo_config_get_boolean_with_default (
+		        config->db, path, FALSE, NULL);
+		g_free (path);
+		
 		path = g_strdup_printf ("/Mail/Accounts/account_pgp_encrypt_to_self_%d", i);
 		account->pgp_encrypt_to_self = bonobo_config_get_boolean_with_default (
 		        config->db, path, TRUE, NULL);
@@ -1086,6 +1092,10 @@ mail_config_write (void)
 		bonobo_config_set_boolean (config->db, path, account->pgp_always_sign, NULL);
 		g_free (path);
 		
+		path = g_strdup_printf ("/Mail/Accounts/account_pgp_no_imip_sign_%d", i);
+		bonobo_config_set_boolean (config->db, path, account->pgp_no_imip_sign, NULL);
+		g_free (path);
+		
 		path = g_strdup_printf ("/Mail/Accounts/account_pgp_encrypt_to_self_%d", i);
 		bonobo_config_set_boolean (config->db, path, 
 					   account->pgp_encrypt_to_self, NULL);
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index add7450e95..a1d9c9928e 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -2179,6 +2179,20 @@ Kerberos
 
 	  <widget>
 	    <class>GtkCheckButton</class>
+	    <name>pgp_no_imip_sign</name>
+	    <can_focus>True</can_focus>
+	    <label>Don't sign _meeting requests (for Outlook compatibility)</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
+	    <child>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkCheckButton</class>
 	    <name>pgp_encrypt_to_self</name>
 	    <can_focus>True</can_focus>
 	    <label>Al_ways encrypt to myself when sending encrypted mail</label>
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 49c1013785..7db91b2cfe 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -83,6 +83,7 @@ typedef struct {
 	char *pgp_key;
 	gboolean pgp_encrypt_to_self;
 	gboolean pgp_always_sign;
+	gboolean pgp_no_imip_sign;
 	gboolean pgp_always_trust;
 	
 	char *smime_key;