aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog9
-rw-r--r--mail/mail-search.c5
2 files changed, 11 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 11fc64447e..4cd98f177e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -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-18 Rodney Dawes <dobey@ximian.com>
* Makefile.am:
diff --git a/mail/mail-search.c b/mail/mail-search.c
index a9bb471507..e79be29121 100644
--- a/mail/mail-search.c
+++ b/mail/mail-search.c
@@ -215,7 +215,7 @@ dialog_response_cb (GtkWidget *widget, int button, MailSearch *ms)
}
g_free (search_text);
- } else if (button == GTK_RESPONSE_CANCEL) {
+ } else if (button == GTK_RESPONSE_CLOSE) {
gtk_widget_destroy (widget);
}
}
@@ -281,11 +281,10 @@ mail_search_construct (MailSearch *ms, MailDisplay *mail)
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;