[evolution-patches] fix for bug #41142 (ui)

[Jeffrey Stedfast <fejj ximian com>]

http://bugzilla.ximian.com/show_bug.cgi?id=41142

Jeff

-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2699
diff -u -r1.2699 ChangeLog
--- ChangeLog	17 Apr 2003 03:58:42 -0000	1.2699
+++ ChangeLog	17 Apr 2003 17:47:11 -0000
@@ -1,3 +1,12 @@
+2003-04-17  Jeffrey Stedfast  <fejj ximian com>
+
+	Fixes for bug #41142.
+
+	* mail-search.c (dialog_response_cb): Handle a GTK_RESPONSE_CLOSE
+	response.
+	(mail_search_construct): Changed the Cancel button into a Close
+	button.
+
 2003-04-17  Not Zed  <NotZed Ximian com>
 
 	* mail-signature-editor.c (menu_help): remove the help menu item
Index: mail-search.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-search.c,v
retrieving revision 1.25
diff -u -r1.25 mail-search.c
--- mail-search.c	10 Apr 2003 21:15:43 -0000	1.25
+++ mail-search.c	17 Apr 2003 17:47:11 -0000
@@ -215,7 +215,7 @@
 		}
 		
 		g_free (search_text);
-	} else if (button == GTK_RESPONSE_CANCEL) {
+	} else if (button == GTK_RESPONSE_CLOSE) {
 		gtk_widget_destroy (widget);
 	}
 }
@@ -281,11 +281,10 @@
 	
 	gtk_window_set_title ((GtkWindow *) ms, _("Find in Message"));
 	
-	gtk_dialog_add_button ((GtkDialog *) ms, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-	
 	button = gtk_button_new_from_stock (GTK_STOCK_FIND);
 	gtk_button_set_label ((GtkButton *) button, _("Search"));
 	gtk_dialog_add_action_widget ((GtkDialog*) ms, button, GTK_RESPONSE_ACCEPT);
+	gtk_dialog_add_button ((GtkDialog *) ms, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
 	gtk_dialog_set_default_response ((GtkDialog *) ms, GTK_RESPONSE_ACCEPT);
 	
 	ms->search_forward = TRUE;