Re: [evolution-patches] #54788: can't remove advanced search items property

[Bill Zhu <bill zhu sun com>]

ok,this is the patch with Changelog.
would you help me commit it?

在2004年02月25日的22:50，JP Rosevear写道：
> On Tue, 2004-02-24 at 21:59, Bill Zhu wrote:
> > Hi, please help to see this patch.
> > 	
> > * bug description:
> > 	http://bugzilla.ximian.com/show_bug.cgi?id=54788
> > 
> > * why this happen?
> > 	This is a bug of bonobo_ui_component_set.
> > 	Before we reset the bonobo ui component, we should remove it first. or
> > if the size of the old menu is larger than the new one's,  the tail of
> > the old menu will be still there but not be removed.
> > 
> > * changes
> > 	/widgets/misc/e-search-bar.c
> > 
> > This patch is both for 1.5 and 1.4.
> 
> Approved for 1.5.  I think i'd like to leave this out of 1.4 since it
> doesn't seem to cause a crash or anything.  Please include a changelog
> entry in the patch in future.
> 
> -JP

Index: e-search-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/e-search-bar.c,v
retrieving revision 1.75
diff -u -r1.75 e-search-bar.c
--- e-search-bar.c	29 Jan 2004 01:57:56 -0000	1.75
+++ e-search-bar.c	25 Feb 2004 02:47:13 -0000
@@ -556,6 +556,7 @@
 	g_string_append (xml, "</placeholder>");
 	g_string_append (xml, "</submenu>");
 	
+	remove_bonobo_menus (esb);
 	bonobo_ui_component_set (esb->ui_component, "/menu/SearchPlaceholder", xml->str, NULL);
 
 	g_string_free (xml, TRUE);
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/widgets/misc/ChangeLog,v
retrieving revision 1.273
diff -u -r1.273 ChangeLog
--- ChangeLog	11 Feb 2004 18:30:32 -0000	1.273
+++ ChangeLog	26 Feb 2004 07:46:24 -0000
@@ -1,3 +1,10 @@
+2004-02-26  Bill Zhu <bill zhu sun com>
+
+	* e-search-bar.c (setup_bonobo_menus): Before Update the bonobo ui
+	component, remove it first.
+
+	Fixes #54788
+
 2004-02-11  Rodney Dawes  <dobey ximian com>
 
 	* e-multi-config-dialog.c (impl_response): Change the filename and