[UPDATED] Re: [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>]

Here is a patch which implements it in the way you describe below,
however I do not think it is the best way because the trend in that code
si to name it according to the menu it is in and the only references to
those names are in e-msg-compoesr.c so therefor I don't see the problem
in changing them.

And as well as changing the line below, the comments in the source
should be updated as well (which are in this patch)

Cheers,
Trent

> You should probably leave the command-names alone and just change their
> location in the menu structure (ie. should only need to have to edit the
> ui/evolution-message-composer.xml file; should not need any source code
> changes).
> 
> The command names don't necessarily have to match the menu they are in.
> 
> in summary, just change:
> 
> <submenu name="Security" _label="_Security">
> 
> to
> 
> <submenu name="Options" _label="_Options">
> 
> 
> That said... this change really needs to go past the product design team
> (pretty sure they are also on this list so hopefully they'll take a
> look)
> 
> Jeff
> 
> On Mon, 2004-03-08 at 03:44, Trent Lloyd wrote:
> > 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
> -- 
> Jeffrey Stedfast
> Evolution Hacker - Ximian, Inc.
> fejj ximian com  - www.ximian.com
> 
> _______________________________________________
> Evolution-patches mailing list
> Evolution-patches lists ximian com
> http://lists.ximian.com/mailman/listinfo/evolution-patches

-- 
[ Trent "Lathiat" Lloyd  lathi sixlabs org ]/ "You sure as hell shouldn't be   \
[ tlhIngan Hol Dajatlh'e   www.sixlabs.org ]| fingering my toaster" -Linus     |
[ GPG Key Id: 0x04AB3C5D        www.bur.st ]| Torvalds, LCA2003 Speakers dinner|
[ IPv6 Conference  http://conf.sixlabs.org ]\ talking about ipv6 with me       /

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 15:21:41 -0000
@@ -133,7 +133,7 @@
                 	<placeholder name="Component"/>
                 </submenu>
 		
-                <submenu name="Security" _label="_Security">
+                <submenu name="Options" _label="_Options">
                         <menuitem name="SecurityPGPSign" verb="" _label="PGP Sign"/>
                         <menuitem name="SecurityPGPEncrypt" verb="" _label="PGP Encrypt"/>
                         <menuitem name="SecuritySMimeSign" verb="" _label="S/MIME Sign"/>
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 15:22:03 -0000
@@ -2185,7 +2185,7 @@
 		composer->uic, "ViewBCC",
 		menu_view_bcc_cb, composer);
 	
-	/* Security -> PGP Sign */
+	/* Options -> PGP Sign */
 	bonobo_ui_component_set_prop (
 		composer->uic, "/commands/SecurityPGPSign",
 		"state", composer->pgp_sign ? "1" : "0", NULL);
@@ -2194,7 +2194,7 @@
 		composer->uic, "SecurityPGPSign",
 		menu_security_pgp_sign_cb, composer);
 	
-	/* Security -> PGP Encrypt */
+	/* Options -> PGP Encrypt */
 	bonobo_ui_component_set_prop (
 		composer->uic, "/commands/SecurityPGPEncrypt",
 		"state", composer->pgp_encrypt ? "1" : "0", NULL);
@@ -2209,7 +2209,7 @@
 	hide_smime = TRUE;
 #endif
 	
-	/* Security -> S/MIME Sign */
+	/* Options -> S/MIME Sign */
 	bonobo_ui_component_set_prop (
 		composer->uic, "/commands/SecuritySMimeSign",
 		"state", composer->smime_sign ? "1" : "0", NULL);
@@ -2221,7 +2221,7 @@
 		composer->uic, "SecuritySMimeSign",
 		menu_security_smime_sign_cb, composer);
 	
-	/* Security -> S/MIME Encrypt */
+	/* Options -> S/MIME Encrypt */
 	bonobo_ui_component_set_prop (
 		composer->uic, "/commands/SecuritySMimeEncrypt",
 		"state", composer->smime_encrypt ? "1" : "0", NULL);
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 15:22:06 -0000
@@ -1,3 +1,12 @@
+2004-03-08  Trent Lloyd <lathiat sixlabs org>
+
+	* ui/evolution-message-composer.xml: change Security menu to be called
+	options to allow for other non-security options in future to have a
+	nice home.
+	* composer/e-msg-composer.c: Change comments for Security menu items
+	to be called Options as to reflect changed in
+	evolution-message-composer.xml.
+
 2004-03-05  JP Rosevear <jpr ximian com>
 
 	* configure.in: bump version, requirements