aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog25
-rw-r--r--ChangeLog.ja25
-rw-r--r--src/action.c5
-rw-r--r--src/addressadd.c5
-rw-r--r--src/editaddress.c10
-rw-r--r--src/editbook.c5
-rw-r--r--src/editgroup.c5
-rw-r--r--src/editjpilot.c5
-rw-r--r--src/editldap.c5
-rw-r--r--src/editldap_basedn.c5
-rw-r--r--src/editvcard.c5
-rw-r--r--src/export.c10
-rw-r--r--src/grouplistdialog.c11
-rw-r--r--src/import.c10
-rw-r--r--src/importldif.c6
-rw-r--r--src/message_search.c10
-rw-r--r--src/prefs_customheader.c7
-rw-r--r--src/prefs_display_header.c7
-rw-r--r--src/prefs_filter_edit.c10
-rw-r--r--src/prefs_summary_column.c7
-rw-r--r--src/select-keys.c8
-rw-r--r--src/sigstatus.c4
-rw-r--r--src/summary_search.c10
-rw-r--r--src/textview.c3
24 files changed, 135 insertions, 68 deletions
diff --git a/ChangeLog b/ChangeLog
index 00389363..ad570197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,30 @@
2005-01-24
+ * src/prefs_display_header.c
+ src/action.c
+ src/grouplistdialog.c
+ src/textview.c
+ src/editbook.c
+ src/editgroup.c
+ src/importldif.c
+ src/summary_search.c
+ src/message_search.c
+ src/select-keys.c
+ src/editjpilot.c
+ src/export.c
+ src/editaddress.c
+ src/addressadd.c
+ src/editldap_basedn.c
+ src/prefs_summary_column.c
+ src/import.c
+ src/prefs_filter_edit.c
+ src/editvcard.c
+ src/prefs_customheader.c
+ src/editldap.c
+ src/sigstatus.c: use GTK stock button for button set.
+
+2005-01-24
+
* src/compose.c
src/inc.c
src/prefs_actions.c
diff --git a/ChangeLog.ja b/ChangeLog.ja
index cb02661d..388a235d 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,30 @@
2005-01-24
+ * src/prefs_display_header.c
+ src/action.c
+ src/grouplistdialog.c
+ src/textview.c
+ src/editbook.c
+ src/editgroup.c
+ src/importldif.c
+ src/summary_search.c
+ src/message_search.c
+ src/select-keys.c
+ src/editjpilot.c
+ src/export.c
+ src/editaddress.c
+ src/addressadd.c
+ src/editldap_basedn.c
+ src/prefs_summary_column.c
+ src/import.c
+ src/prefs_filter_edit.c
+ src/editvcard.c
+ src/prefs_customheader.c
+ src/editldap.c
+ src/sigstatus.c: ボタンセットに GTK のストックボタンを使用。
+
+2005-01-24
+
* src/compose.c
src/inc.c
src/prefs_actions.c
diff --git a/src/action.c b/src/action.c
index 430de479..22c13108 100644
--- a/src/action.c
+++ b/src/action.c
@@ -1103,8 +1103,9 @@ static void create_io_dialog(Children *children)
gtk_widget_grab_focus(entry);
}
- gtkut_button_set_create(&hbox, &abort_button, _("Abort"),
- &close_button, _("Close"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbox, &abort_button, _("Abort"),
+ &close_button, GTK_STOCK_CLOSE,
+ NULL, NULL);
g_signal_connect(G_OBJECT(abort_button), "clicked",
G_CALLBACK(kill_children_cb), children);
g_signal_connect(G_OBJECT(close_button), "clicked",
diff --git a/src/addressadd.c b/src/addressadd.c
index dd553fce..005961b9 100644
--- a/src/addressadd.c
+++ b/src/addressadd.c
@@ -239,8 +239,9 @@ static void addressadd_create( void ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
gtk_widget_grab_default(ok_btn);
diff --git a/src/editaddress.c b/src/editaddress.c
index 35c57d20..912ae0cb 100644
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -196,8 +196,9 @@ static void addressbook_edit_address_create(gboolean *cancelled)
SET_LABEL_AND_ENTRY(_("Address"), addr_entry, 1);
SET_LABEL_AND_ENTRY(_("Remarks"), rem_entry, 2);
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
@@ -669,8 +670,9 @@ static void addressbook_edit_person_dialog_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vnbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
diff --git a/src/editbook.c b/src/editbook.c
index 68208c03..aecbca3d 100644
--- a/src/editbook.c
+++ b/src/editbook.c
@@ -218,8 +218,9 @@ static void addressbook_edit_book_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
gtk_widget_grab_default(ok_btn);
diff --git a/src/editgroup.c b/src/editgroup.c
index 59948608..30dbd3a7 100644
--- a/src/editgroup.c
+++ b/src/editgroup.c
@@ -366,8 +366,9 @@ static void addressbook_edit_group_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
diff --git a/src/editjpilot.c b/src/editjpilot.c
index b2b36f01..731cec0c 100644
--- a/src/editjpilot.c
+++ b/src/editjpilot.c
@@ -342,8 +342,9 @@ static void addressbook_edit_jpilot_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
gtk_widget_grab_default(ok_btn);
diff --git a/src/editldap.c b/src/editldap.c
index 4ef4e4a3..ef987f22 100644
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -241,8 +241,9 @@ static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
diff --git a/src/editldap_basedn.c b/src/editldap_basedn.c
index 54bca814..0ffa491c 100644
--- a/src/editldap_basedn.c
+++ b/src/editldap_basedn.c
@@ -211,8 +211,9 @@ static void edit_ldap_bdn_create(void) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
gtk_widget_grab_default(ok_btn);
diff --git a/src/editvcard.c b/src/editvcard.c
index eaa18800..53bb23cf 100644
--- a/src/editvcard.c
+++ b/src/editvcard.c
@@ -237,8 +237,9 @@ static void addressbook_edit_vcard_create( gboolean *cancelled ) {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
gtk_widget_grab_default(ok_btn);
diff --git a/src/export.c b/src/export.c
index e78ddab9..f55dc1e3 100644
--- a/src/export.c
+++ b/src/export.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -194,10 +194,10 @@ static void export_create(void)
g_signal_connect(G_OBJECT(file_button), "clicked",
G_CALLBACK(export_filesel_cb), NULL);
- gtkut_button_set_create(&confirm_area,
- &ok_button, _("OK"),
- &cancel_button, _("Cancel"),
- NULL, NULL);
+ gtkut_stock_button_set_create(&confirm_area,
+ &ok_button, GTK_STOCK_OK,
+ &cancel_button, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_button);
diff --git a/src/grouplistdialog.c b/src/grouplistdialog.c
index 28977514..7088ede6 100644
--- a/src/grouplistdialog.c
+++ b/src/grouplistdialog.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -38,6 +38,7 @@
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkhbbox.h>
+#include <gtk/gtkstock.h>
#include <string.h>
#include <fnmatch.h>
@@ -241,10 +242,10 @@ static void grouplist_dialog_create(void)
status_label = gtk_label_new("");
gtk_box_pack_start(GTK_BOX(hbox), status_label, FALSE, FALSE, 0);
- gtkut_button_set_create(&confirm_area,
- &ok_button, _("OK"),
- &cancel_button, _("Cancel"),
- &refresh_button, _("Refresh"));
+ gtkut_stock_button_set_create(&confirm_area,
+ &ok_button, GTK_STOCK_OK,
+ &cancel_button, GTK_STOCK_CANCEL,
+ &refresh_button, GTK_STOCK_REFRESH);
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
confirm_area);
gtk_widget_grab_default(ok_button);
diff --git a/src/import.c b/src/import.c
index 9bf2a883..754e534e 100644
--- a/src/import.c
+++ b/src/import.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -199,10 +199,10 @@ static void import_create(void)
g_signal_connect(G_OBJECT(dest_button), "clicked",
G_CALLBACK(import_destsel_cb), NULL);
- gtkut_button_set_create(&confirm_area,
- &ok_button, _("OK"),
- &cancel_button, _("Cancel"),
- NULL, NULL);
+ gtkut_stock_button_set_create(&confirm_area,
+ &ok_button, GTK_STOCK_OK,
+ &cancel_button, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_button);
diff --git a/src/importldif.c b/src/importldif.c
index b7bfa5a0..3420c3c9 100644
--- a/src/importldif.c
+++ b/src/importldif.c
@@ -757,9 +757,9 @@ static void imp_ldif_dialog_create() {
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_button_set_create(&hbbox, &btnPrev, _( "Prev" ),
- &btnNext, _( "Next" ),
- &btnCancel, _( "Cancel" ) );
+ gtkut_stock_button_set_create(&hbbox, &btnPrev, _("Prev"),
+ &btnNext, _("Next"),
+ &btnCancel, GTK_STOCK_CANCEL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width(GTK_CONTAINER(hbbox), 2);
gtk_widget_grab_default(btnNext);
diff --git a/src/message_search.c b/src/message_search.c
index e49daca1..36d3a8bd 100644
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -130,10 +130,10 @@ static void message_search_create(MessageView *messageview)
gtk_box_pack_start (GTK_BOX (checkbtn_hbox), backward_checkbtn,
FALSE, FALSE, 0);
- gtkut_button_set_create(&confirm_area,
- &search_btn, _("Search"),
- &clear_btn, _("Clear"),
- &close_btn, _("Close"));
+ gtkut_stock_button_set_create(&confirm_area,
+ &search_btn, GTK_STOCK_FIND,
+ &clear_btn, GTK_STOCK_CLEAR,
+ &close_btn, GTK_STOCK_CLOSE);
gtk_widget_show (confirm_area);
gtk_box_pack_start (GTK_BOX (vbox1), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(search_btn);
diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index f7b1d5df..4b4ca036 100644
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -154,8 +154,9 @@ static void prefs_custom_header_create(void)
gtk_widget_show (vbox);
gtk_container_add (GTK_CONTAINER (window), vbox);
- gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_widget_show (confirm_area);
gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default (ok_btn);
diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index 8239b7de..c34e30d0 100644
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -188,8 +188,9 @@ static void prefs_display_header_create(void)
gtk_widget_show (btn_hbox);
gtk_box_pack_end (GTK_BOX (vbox), btn_hbox, FALSE, FALSE, 0);
- gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_widget_show (confirm_area);
gtk_box_pack_end (GTK_BOX(btn_hbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default (ok_btn);
diff --git a/src/prefs_filter_edit.c b/src/prefs_filter_edit.c
index d1dc7d90..dc6587cd 100644
--- a/src/prefs_filter_edit.c
+++ b/src/prefs_filter_edit.c
@@ -327,8 +327,9 @@ static void prefs_filter_edit_create(void)
gtk_widget_show(vbox);
gtk_container_add(GTK_CONTAINER(window), vbox);
- gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_widget_show(confirm_area);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
@@ -1552,8 +1553,9 @@ static void prefs_filter_edit_edit_header_list_dialog_create(void)
del_btn = gtk_button_new_with_label(_(" Delete "));
gtk_box_pack_start(GTK_BOX(btn_vbox), del_btn, FALSE, FALSE, 0);
- gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
diff --git a/src/prefs_summary_column.c b/src/prefs_summary_column.c
index 8fdf6be8..169532ee 100644
--- a/src/prefs_summary_column.c
+++ b/src/prefs_summary_column.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -303,8 +303,9 @@ static void prefs_summary_column_create(void)
g_signal_connect(G_OBJECT(default_btn), "clicked",
G_CALLBACK(prefs_summary_column_set_to_default), NULL);
- gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ gtkut_stock_button_set_create(&confirm_area, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_widget_show(confirm_area);
gtk_box_pack_end(GTK_BOX(btn_hbox), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
diff --git a/src/select-keys.c b/src/select-keys.c
index 24e82a39..ccfd1ad1 100644
--- a/src/select-keys.c
+++ b/src/select-keys.c
@@ -318,10 +318,10 @@ create_dialog (struct select_keys_s *sk)
hbox = gtk_hbox_new (FALSE, 8);
gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- gtkut_button_set_create (&bbox,
- &select_btn, _("Select"),
- &cancel_btn, _("Cancel"),
- &other_btn, _("Other"));
+ gtkut_stock_button_set_create (&bbox,
+ &select_btn, _("Select"),
+ &cancel_btn, GTK_STOCK_CANCEL,
+ &other_btn, _("Other"));
gtk_box_pack_end (GTK_BOX (hbox), bbox, FALSE, FALSE, 0);
gtk_widget_grab_default (select_btn);
diff --git a/src/sigstatus.c b/src/sigstatus.c
index a9905f0a..cd75350c 100644
--- a/src/sigstatus.c
+++ b/src/sigstatus.c
@@ -132,8 +132,8 @@ GpgmegtkSigStatus gpgmegtk_sig_status_create(void)
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 8);
gtk_widget_show(label);
- gtkut_button_set_create(&okay_area, &okay_btn, _("OK"),
- NULL, NULL, NULL, NULL);
+ gtkut_stock_button_set_create(&okay_area, &okay_btn, GTK_STOCK_OK,
+ NULL, NULL, NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), okay_area, FALSE, FALSE, 0);
gtk_widget_grab_default(okay_btn);
g_signal_connect(G_OBJECT(okay_btn), "clicked",
diff --git a/src/summary_search.c b/src/summary_search.c
index 9ee39dde..f143996e 100644
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -1,6 +1,6 @@
/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -218,10 +218,10 @@ static void summary_search_create(SummaryView *summaryview)
g_signal_connect(G_OBJECT(all_checkbtn), "clicked",
G_CALLBACK(all_clicked), summaryview);
- gtkut_button_set_create(&confirm_area,
- &search_btn, _("Search"),
- &clear_btn, _("Clear"),
- &close_btn, _("Close"));
+ gtkut_stock_button_set_create(&confirm_area,
+ &search_btn, GTK_STOCK_FIND,
+ &clear_btn, GTK_STOCK_CLEAR,
+ &close_btn, GTK_STOCK_CLOSE);
gtk_widget_show (confirm_area);
gtk_box_pack_start (GTK_BOX (vbox1), confirm_area, FALSE, FALSE, 0);
gtk_widget_grab_default(search_btn);
diff --git a/src/textview.c b/src/textview.c
index 2d5f6754..675a258d 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1623,7 +1623,8 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
"the apparent URL (%s).\n"
"Open it anyway?"),
uri->uri, visible_str);
- aval = alertpanel(_("Warning"), msg, _("Yes"), _("No"), NULL);
+ aval = alertpanel(_("Warning"), msg,
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL);
g_free(msg);
if (aval == G_ALERTDEFAULT)
retval = TRUE;