Re: [evolution-patches] 38927, signaure editor help

[Not Zed <notzed ximian com>]

committed

On Thu, 2003-04-17 at 05:27, Not Zed wrote:
> As suggested by Aaron, this patch just removes the help menu &
> associated code.
> 
> (its not on, for example, the composer, so it seems odd to put it on the
> sig editor).
> 
>  Z
> 
> 
> ______________________________________________________________________
> 
> ? mail/GNOME_Evolution_Mail.oaf
> ? mail/GNOME_Evolution_Mail.oafinfo
> ? mail/Mail-common.c
> ? mail/Mail-skels.c
> ? mail/Mail-stubs.c
> ? mail/Mail.h
> ? mail/a
> ? mail/a.out
> ? mail/bak
> ? mail/blah.c
> ? mail/blah.ps
> ? mail/changes.diff
> ? mail/conf.keys
> ? mail/diff
> ? mail/econf.h
> ? mail/mail-config.c.save
> ? mail/mail-config.evolution
> ? mail/mail-send-recv.c.save
> ? mail/message-list.c.save
> ? mail/ml.diff
> ? mail/old
> ? mail/out
> ? mail/store_change.diff
> ? mail/subscribe-dialog-new.c
> ? mail/subscribe-dialog.c.new
> ? mail/subscribe-dialog.c.new2
> ? mail/test-mt
> ? mail/typescript
> ? mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf
> ? mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf.in
> ? mail/importers/GNOME_Evolution_Mail_Mbox_Importer.oaf
> ? mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf
> ? mail/importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf.in
> ? mail/importers/GNOME_Evolution_Mail_Outlook_Importer.oaf
> ? mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf
> ? mail/importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf.in
> ? mail/importers/am.diff
> ? mail/importers/b
> ? mail/importers/elm-importer.c.new
> ? mail/importers/elm.ps
> ? mail/importers/im.diff
> Index: ui/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/ui/ChangeLog,v
> retrieving revision 1.332
> diff -u -3 -r1.332 ChangeLog
> --- ui/ChangeLog	7 Apr 2003 23:19:19 -0000	1.332
> +++ ui/ChangeLog	17 Apr 2003 03:31:53 -0000
> @@ -1,3 +1,8 @@
> +2003-04-17  Not Zed  <NotZed Ximian com>
> +
> +	* evolution-signature-editor.xml: Remove the Help menu.
> +	'Fix' for #38927.
> +
>  2003-04-07  Chris Toshok  <toshok ximian com>
>  
>  	[ fixes bug #39763 ]
> Index: ui/evolution-signature-editor.xml
> ===================================================================
> RCS file: /cvs/gnome/evolution/ui/evolution-signature-editor.xml,v
> retrieving revision 1.11
> diff -u -3 -r1.11 evolution-signature-editor.xml
> --- ui/evolution-signature-editor.xml	20 Nov 2002 22:57:13 -0000	1.11
> +++ ui/evolution-signature-editor.xml	17 Apr 2003 03:31:54 -0000
> @@ -64,10 +64,6 @@
>                  </submenu>
>  
>  		<placeholder name="Component"/>
> -
> -		<submenu name="Help" _label="_Help">
> -	                <menuitem name="HelpSigEditor" verb="" _label="_Signature editor"/>
> -		</submenu>
>  	</menu>
>  
>  	<dockitem name="Toolbar" behavior="exclusive" hlook="both_horiz" vlook="icon">
> Index: mail/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
> retrieving revision 1.2698
> diff -u -3 -r1.2698 ChangeLog
> --- mail/ChangeLog	17 Apr 2003 03:14:31 -0000	1.2698
> +++ mail/ChangeLog	17 Apr 2003 03:33:12 -0000
> @@ -1,3 +1,8 @@
> +2003-04-17  Not Zed  <NotZed Ximian com>
> +
> +	* mail-signature-editor.c (menu_help): remove the help menu item
> +	handling, as the help menu is removed.  Clean up of #38927.
> +
>  2003-04-16  Not Zed  <NotZed Ximian com>
>  
>  	* importers/Makefile.am (%.server.in): Remove COMPONENTDIR and set
> Index: mail/mail-signature-editor.c
> ===================================================================
> RCS file: /cvs/gnome/evolution/mail/mail-signature-editor.c,v
> retrieving revision 1.31
> diff -u -3 -r1.31 mail-signature-editor.c
> --- mail/mail-signature-editor.c	25 Mar 2003 15:49:19 -0000	1.31
> +++ mail/mail-signature-editor.c	17 Apr 2003 03:33:14 -0000
> @@ -271,18 +271,11 @@
>  	destroy_editor (editor);
>  }
>  
> -static void
> -menu_help (BonoboUIComponent *uih, void *data, const char *path)
> -{
> -	gnome_help_display ("usage-mail-getnsend-send.html", "HTML-SIGNATURE-HOWTO", NULL);
> -}
> -
>  static BonoboUIVerb verbs [] = {
>  
>  	BONOBO_UI_VERB ("FileSave",       menu_file_save_cb),
>  	BONOBO_UI_VERB ("FileClose",      menu_file_close_cb),
>  	BONOBO_UI_VERB ("FileSaveClose",  menu_file_save_close_cb),
> -	BONOBO_UI_VERB ("HelpSigEditor",  menu_help),
>  	
>  	BONOBO_UI_VERB_END
>  };