From bfa7f88ced7715b3cdabb038e6f57c9784d0a8eb Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Thu, 9 Aug 2001 19:24:06 +0000
Subject: Save the pgp and smime always-sign options.

2001-08-09  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-account-gui.c (mail_account_gui_save): Save the pgp and
	smime always-sign options.

	* mail-config.c (account_copy): Copy the always-sign options over
	too.

svn path=/trunk/; revision=11841
---
 mail/mail-config.glade | 74 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 60 insertions(+), 14 deletions(-)

(limited to 'mail/mail-config.glade')

diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 76fabd40c5..d32051c9aa 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -1767,7 +1767,7 @@ Kerberos
 	  <class>GtkTable</class>
 	  <name>pgp_table</name>
 	  <border_width>3</border_width>
-	  <rows>2</rows>
+	  <rows>3</rows>
 	  <columns>2</columns>
 	  <homogeneous>False</homogeneous>
 	  <row_spacing>4</row_spacing>
@@ -1830,6 +1830,29 @@ Kerberos
 	    <label>Always encrypt to myself when sending encrypted mail</label>
 	    <active>True</active>
 	    <draw_indicator>True</draw_indicator>
+	    <child>
+	      <left_attach>0</left_attach>
+	      <right_attach>2</right_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkCheckButton</class>
+	    <name>pgp_always_sign</name>
+	    <can_focus>True</can_focus>
+	    <label>Always sign outgoing messages when using this account</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>2</right_attach>
@@ -1865,7 +1888,7 @@ Kerberos
 	  <class>GtkTable</class>
 	  <name>smime_table</name>
 	  <border_width>3</border_width>
-	  <rows>2</rows>
+	  <rows>3</rows>
 	  <columns>3</columns>
 	  <homogeneous>False</homogeneous>
 	  <row_spacing>4</row_spacing>
@@ -1931,8 +1954,8 @@ Kerberos
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>2</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
@@ -1945,14 +1968,37 @@ Kerberos
 	  </widget>
 
 	  <widget>
-	    <class>GnomeHRef</class>
-	    <name>get_digital_id</name>
+	    <class>GtkButton</class>
+	    <name>digital_ids</name>
 	    <can_focus>True</can_focus>
-	    <url>http://www.verisign.com/products/class1/index.html</url>
-	    <label>Get Digital ID...</label>
+	    <label>Digital IDs...</label>
+	    <relief>GTK_RELIEF_NORMAL</relief>
 	    <child>
 	      <left_attach>2</left_attach>
 	      <right_attach>3</right_attach>
+	      <top_attach>0</top_attach>
+	      <bottom_attach>1</bottom_attach>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <xexpand>False</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkCheckButton</class>
+	    <name>smime_always_sign</name>
+	    <can_focus>True</can_focus>
+	    <label>Always sign outgoing messages when using this account</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
+	    <child>
+	      <left_attach>0</left_attach>
+	      <right_attach>2</right_attach>
 	      <top_attach>1</top_attach>
 	      <bottom_attach>2</bottom_attach>
 	      <xpad>0</xpad>
@@ -1967,16 +2013,16 @@ Kerberos
 	  </widget>
 
 	  <widget>
-	    <class>GtkButton</class>
-	    <name>digital_ids</name>
+	    <class>GnomeHRef</class>
+	    <name>get_digital_id</name>
 	    <can_focus>True</can_focus>
-	    <label>Digital IDs...</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
+	    <url>http://www.verisign.com/products/class1/index.html</url>
+	    <label>Get Digital ID...</label>
 	    <child>
 	      <left_attach>2</left_attach>
 	      <right_attach>3</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
+	      <top_attach>1</top_attach>
+	      <bottom_attach>2</bottom_attach>
 	      <xpad>0</xpad>
 	      <ypad>0</ypad>
 	      <xexpand>False</xexpand>
-- 
cgit v1.2.3