[evolution-patches] Patch for #34354 and #73270

[Mengjie Yu <Meng-Jie Yu Sun COM>]

hi,hpj

Here is the patch for #34354 and #73270
the related URL is:
http://bugzilla.ximian.com/show_bug.cgi?id=34354 
and  
http://bugzilla.ximian.com/show_bug.cgi?id=73270


Both of them is about evolution/addressbook. And I wonder whether we
should regard them to be bugs and fix them. If so, Will you please help
me to review it?

Thanks a lot.

Yours,
Mengjie

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1926
diff -u -p -r1.1926 ChangeLog
--- ChangeLog	28 Feb 2005 22:20:06 -0000	1.1926
+++ ChangeLog	3 Mar 2005 10:57:50 -0000
@@ -1,3 +1,10 @@
+2005-03-03  Mengjie Yu  <meng-jie yu sun com>
+
+	* gui/search/e-addressbook-search-dialog.c:
+	(eab_search_dialog_init):we should set the Search Dialog modal.
+
+	Fixes: #34354
+
 2005-02-26   Sivaiah Nallagatla <snallagatla novell com>
 
 	* gui/widgets/e-addressbook-view.c :
Index: gui/search/e-addressbook-search-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/search/e-addressbook-search-dialog.c,v
retrieving revision 1.32
diff -u -p -r1.32 e-addressbook-search-dialog.c
--- gui/search/e-addressbook-search-dialog.c	21 Dec 2004 15:38:27 -0000	1.32
+++ gui/search/e-addressbook-search-dialog.c	3 Mar 2005 10:57:51 -0000
@@ -157,8 +157,8 @@ eab_search_dialog_init (EABSearchDialog 
 	gtk_container_set_border_width (GTK_CONTAINER (dialog->action_area), 12);
 
 	gtk_window_set_default_size (GTK_WINDOW (view), 550, 400);
-	gtk_window_set_title(GTK_WINDOW(view), _("Advanced Search"));
-
+	gtk_window_set_title (GTK_WINDOW (view), _("Advanced Search"));
+	gtk_window_set_modal (GTK_WINDOW (view), TRUE);
 	gtk_dialog_add_buttons (dialog,
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 				/*GTK_STOCK_SAVE, GTK_RESPONSE_APPLY,*/

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1926
diff -u -p -r1.1926 ChangeLog
--- ChangeLog	28 Feb 2005 22:20:06 -0000	1.1926
+++ ChangeLog	3 Mar 2005 11:15:07 -0000
@@ -1,3 +1,10 @@
+2005-03-03  Mengjie Yu  <meng-jie yu sun com>
+
+	* gui/widgets/e-addressbook-view.c: (search_menu_activated):
+	make the search field consistent with the Search Dialog.
+
+	Fixes #73270
+
 2005-02-26   Sivaiah Nallagatla <snallagatla novell com>
 
 	* gui/widgets/e-addressbook-view.c :
Index: gui/widgets/e-addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v
retrieving revision 1.159
diff -u -p -r1.159 e-addressbook-view.c
--- gui/widgets/e-addressbook-view.c	28 Feb 2005 22:20:08 -0000	1.159
+++ gui/widgets/e-addressbook-view.c	3 Mar 2005 11:15:14 -0000
@@ -1490,7 +1490,7 @@ static void
 search_menu_activated (ESearchBar *esb, int id, EABView *view)
 {
 	if (id == ESB_ADVANCED)
-		gtk_widget_show(eab_search_dialog_new(view));
+		e_search_bar_set_item_id (esb, id);
 }
 
 static void