[evolution-patches] ui/, composer/: Change security menu to be called Options to make a nice place for non-security Options

[Trent Lloyd <lathiat bur st>]

Hi Guys,

This patch changes the "Security" menu in Composer to be called Options
so that options (such as Message Receipts) have a nice place to go.

To me, it seems creating another menu for Options is silly and this
would be the best way to go.

Don't know of policy if this should be applied or not but it seems sane
to me, If you feel this isnt the way to go then I'd appreciate it if you
would make suggestions for other ways to solve this problem...

Cheers,
Trent

Index: ui/evolution-message-composer.xml
===================================================================
RCS file: /cvs/gnome/evolution/ui/evolution-message-composer.xml,v
retrieving revision 1.42
diff -u -r1.42 evolution-message-composer.xml
--- ui/evolution-message-composer.xml	12 Jan 2004 22:23:33 -0000	1.42
+++ ui/evolution-message-composer.xml	8 Mar 2004 08:38:51 -0000
@@ -59,17 +59,17 @@
 		<cmd name="ViewAttach" _label="Show attachments" _tip="Show / hide attachments"
 		type="toggle" state="0"/>
 		
-                <cmd name="SecurityPGPSign" _label="PGP Sign" _tip="Sign this message with your PGP key"
+                <cmd name="OptionsPGPSign" _label="PGP Sign" _tip="Sign this message with your PGP key"
 		type="toggle" state="0"/>
 		
-                <cmd name="SecurityPGPEncrypt" _label="PGP Encrypt" _tip="Encrypt this message with PGP"
+                <cmd name="OptionsPGPEncrypt" _label="PGP Encrypt" _tip="Encrypt this message with PGP"
 		type="toggle" state="0"/>
 		
-                <cmd name="SecuritySMimeSign" _label="S/MIME Sign" 
+                <cmd name="OptionsSMimeSign" _label="S/MIME Sign" 
                 _tip="Sign this message with your S/MIME Signature Certificate"
 		type="toggle" state="0" hidden="1"/>
 		
-                <cmd name="SecuritySMimeEncrypt" _label="S/MIME Encrypt" 
+                <cmd name="OptionsSMimeEncrypt" _label="S/MIME Encrypt" 
                 _tip="Encrypt this message with your S/MIME Encryption Cetificate"
 		type="toggle" state="0" hidden="1"/>
 
@@ -133,11 +133,11 @@
                 	<placeholder name="Component"/>
                 </submenu>
 		
-                <submenu name="Security" _label="_Security">
-                        <menuitem name="SecurityPGPSign" verb="" _label="PGP Sign"/>
-                        <menuitem name="SecurityPGPEncrypt" verb="" _label="PGP Encrypt"/>
-                        <menuitem name="SecuritySMimeSign" verb="" _label="S/MIME Sign"/>
-                        <menuitem name="SecuritySMimeEncrypt" verb="" _label="S/MIME Encrypt"/>
+                <submenu name="Options" _label="_Options">
+                        <menuitem name="OptionsPGPSign" verb="" _label="PGP Sign"/>
+                        <menuitem name="OptionsPGPEncrypt" verb="" _label="PGP Encrypt"/>
+                        <menuitem name="OptionsSMimeSign" verb="" _label="S/MIME Sign"/>
+                        <menuitem name="OptionsSMimeEncrypt" verb="" _label="S/MIME Encrypt"/>
                 </submenu>
 		
 	</menu>
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1315
diff -u -r1.1315 ChangeLog
--- ChangeLog	5 Mar 2004 19:37:17 -0000	1.1315
+++ ChangeLog	8 Mar 2004 08:38:53 -0000
@@ -1,3 +1,11 @@
+2004-03-08  Trent Lloyd <lathiat sixlabs org>
+
+	* ui/evolution-message-composer.xml: change Security to Options to
+	allow for other non-security options in future
+	* composer/e-msg-composer.c: change Security to Options to reflect
+	changes in evolution-message-composer.xml for allowing non-security
+	options in future.
+
 2004-03-05  JP Rosevear <jpr ximian com>
 
 	* configure.in: bump version, requirements
Index: composer/e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.441
diff -u -r1.441 e-msg-composer.c
--- composer/e-msg-composer.c	5 Mar 2004 18:18:52 -0000	1.441
+++ composer/e-msg-composer.c	8 Mar 2004 08:39:14 -0000
@@ -2185,22 +2185,22 @@
 		composer->uic, "ViewBCC",
 		menu_view_bcc_cb, composer);
 	
-	/* Security -> PGP Sign */
+	/* Options -> PGP Sign */
 	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecurityPGPSign",
+		composer->uic, "/commands/OptionsPGPSign",
 		"state", composer->pgp_sign ? "1" : "0", NULL);
 	
 	bonobo_ui_component_add_listener (
-		composer->uic, "SecurityPGPSign",
+		composer->uic, "OptionsPGPSign",
 		menu_security_pgp_sign_cb, composer);
 	
-	/* Security -> PGP Encrypt */
+	/* Options -> PGP Encrypt */
 	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecurityPGPEncrypt",
+		composer->uic, "/commands/OptionsPGPEncrypt",
 		"state", composer->pgp_encrypt ? "1" : "0", NULL);
 	
 	bonobo_ui_component_add_listener (
-		composer->uic, "SecurityPGPEncrypt",
+		composer->uic, "OptionsPGPEncrypt",
 		menu_security_pgp_encrypt_cb, composer);
 	
 #if defined(HAVE_NSS) && defined(SMIME_SUPPORTED)
@@ -2209,28 +2209,28 @@
 	hide_smime = TRUE;
 #endif
 	
-	/* Security -> S/MIME Sign */
+	/* Options -> S/MIME Sign */
 	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecuritySMimeSign",
+		composer->uic, "/commands/OptionsSMimeSign",
 		"state", composer->smime_sign ? "1" : "0", NULL);
 	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecuritySMimeSign",
+		composer->uic, "/commands/OptionsSMimeSign",
 		"hidden", hide_smime ? "1" : "0", NULL);
 	
 	bonobo_ui_component_add_listener (
-		composer->uic, "SecuritySMimeSign",
+		composer->uic, "OptionsSMimeSign",
 		menu_security_smime_sign_cb, composer);
 	
-	/* Security -> S/MIME Encrypt */
+	/* Options -> S/MIME Encrypt */
 	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecuritySMimeEncrypt",
+		composer->uic, "/commands/OptionsSMimeEncrypt",
 		"state", composer->smime_encrypt ? "1" : "0", NULL);
 	bonobo_ui_component_set_prop (
-		composer->uic, "/commands/SecuritySMimeEncrypt",
+		composer->uic, "/commands/OptionsSMimeEncrypt",
 		"hidden", hide_smime ? "1" : "0", NULL);
 	
 	bonobo_ui_component_add_listener (
-		composer->uic, "SecuritySMimeEncrypt",
+		composer->uic, "OptionsSMimeEncrypt",
 		menu_security_smime_encrypt_cb, composer);
 	
 	/* View -> Attachments */
@@ -4625,7 +4625,7 @@
 	composer->pgp_sign = pgp_sign;
 	e_msg_composer_set_changed (composer);
 	
-	bonobo_ui_component_set_prop (composer->uic, "/commands/SecurityPGPSign",
+	bonobo_ui_component_set_prop (composer->uic, "/commands/OptionsPGPSign",
 				      "state", composer->pgp_sign ? "1" : "0", NULL);
 }
 
@@ -4667,7 +4667,7 @@
 	composer->pgp_encrypt = pgp_encrypt;
 	e_msg_composer_set_changed (composer);
 	
-	bonobo_ui_component_set_prop (composer->uic, "/commands/SecurityPGPEncrypt",
+	bonobo_ui_component_set_prop (composer->uic, "/commands/OptionsPGPEncrypt",
 				      "state", composer->pgp_encrypt ? "1" : "0", NULL);
 }
 
@@ -4709,7 +4709,7 @@
 	composer->smime_sign = smime_sign;	
 	e_msg_composer_set_changed (composer);
 
-	bonobo_ui_component_set_prop (composer->uic, "/commands/SecuritySMimeSign",
+	bonobo_ui_component_set_prop (composer->uic, "/commands/OptionsSMimeSign",
 				      "state", composer->smime_sign ? "1" : "0", NULL);
 }
 
@@ -4751,7 +4751,7 @@
 	composer->smime_encrypt = smime_encrypt;
 	e_msg_composer_set_changed (composer);
 	
-	bonobo_ui_component_set_prop (composer->uic, "/commands/SecuritySMimeEncrypt",
+	bonobo_ui_component_set_prop (composer->uic, "/commands/OptionsSMimeEncrypt",
 				      "state", composer->smime_encrypt ? "1" : "0", NULL);
 }