From b48376c37089790675b8a8670c49aaa950c17cab Mon Sep 17 00:00:00 2001 From: deepend Date: Fri, 30 Jan 2026 09:23:52 -0700 Subject: [PATCH] Added per-file ICON_* macros with GTK3 icon-name mappings and GTK2 stock fallbacks across GTK UI modules like banlist, DCC, editlist, ignore, URL grabber, notify, text events, tray menu, chanview tabs, and join dialog UI. Updated GTK helper usages to reference the new ICON_* (and label) macros so GTK3 builds no longer pass stock IDs to button/icon helpers or dialogs, including banlist buttons, DCC windows, rawlog actions, notify dialog/buttons, pevent dialog buttons, tray menu items, and join dialog image helper usage. --- src/fe-gtk/banlist.c | 19 +++++++++++++++---- src/fe-gtk/chanview-tabs.c | 9 ++++++++- src/fe-gtk/dccgui.c | 25 +++++++++++++++++++------ src/fe-gtk/editlist.c | 21 +++++++++++++++++---- src/fe-gtk/fkeys.c | 21 +++++++++++++++++---- src/fe-gtk/ignoregui.c | 17 ++++++++++++++--- src/fe-gtk/joind.c | 9 ++++++++- src/fe-gtk/notifygui.c | 21 +++++++++++++++++---- src/fe-gtk/plugin-tray.c | 13 +++++++++++-- src/fe-gtk/rawlog.c | 13 +++++++++++-- src/fe-gtk/textgui.c | 17 ++++++++++++++--- src/fe-gtk/urlgrab.c | 17 ++++++++++++++--- 12 files changed, 165 insertions(+), 37 deletions(-) diff --git a/src/fe-gtk/banlist.c b/src/fe-gtk/banlist.c index afdaffdf..fee4e5f7 100644 --- a/src/fe-gtk/banlist.c +++ b/src/fe-gtk/banlist.c @@ -37,6 +37,17 @@ #include "maingui.h" #include "banlist.h" +#if HAVE_GTK3 +#define ICON_BANLIST_REMOVE "list-remove" +#define ICON_BANLIST_CLEAR "edit-clear" +#define ICON_BANLIST_REFRESH "view-refresh" +#endif +#if !HAVE_GTK3 +#define ICON_BANLIST_REMOVE GTK_STOCK_REMOVE +#define ICON_BANLIST_CLEAR GTK_STOCK_CLEAR +#define ICON_BANLIST_REFRESH GTK_STOCK_REFRESH +#endif + /* * These supports_* routines set capable, readable, writable bits */ static void supports_bans (banlist_info *, int); @@ -860,14 +871,14 @@ banlist_opengui (struct session *sess) gtk_box_pack_end (GTK_BOX (vbox), bbox, 0, 0, 0); gtk_widget_show (bbox); - banl->but_remove = gtkutil_button (bbox, GTK_STOCK_REMOVE, 0, banlist_unban, banl, + banl->but_remove = gtkutil_button (bbox, ICON_BANLIST_REMOVE, 0, banlist_unban, banl, _("Remove")); - banl->but_crop = gtkutil_button (bbox, GTK_STOCK_REMOVE, 0, banlist_crop, banl, + banl->but_crop = gtkutil_button (bbox, ICON_BANLIST_REMOVE, 0, banlist_crop, banl, _("Crop")); - banl->but_clear = gtkutil_button (bbox, GTK_STOCK_CLEAR, 0, banlist_clear, banl, + banl->but_clear = gtkutil_button (bbox, ICON_BANLIST_CLEAR, 0, banlist_clear, banl, _("Clear")); - banl->but_refresh = gtkutil_button (bbox, GTK_STOCK_REFRESH, 0, banlist_refresh, banl, _("Refresh")); + banl->but_refresh = gtkutil_button (bbox, ICON_BANLIST_REFRESH, 0, banlist_refresh, banl, _("Refresh")); banlist_do_refresh (banl); diff --git a/src/fe-gtk/chanview-tabs.c b/src/fe-gtk/chanview-tabs.c index 3efed07f..1a2081cd 100644 --- a/src/fe-gtk/chanview-tabs.c +++ b/src/fe-gtk/chanview-tabs.c @@ -27,6 +27,13 @@ typedef struct GtkWidget *b2; /* button2 */ } tabview; +#if HAVE_GTK3 +#define ICON_CHANVIEW_CLOSE "window-close" +#endif +#if !HAVE_GTK3 +#define ICON_CHANVIEW_CLOSE GTK_STOCK_CLOSE +#endif + static void chanview_populate (chanview *cv); /* ignore "toggled" signal? */ @@ -372,7 +379,7 @@ cv_tabs_init (chanview *cv) gtk_box_pack_start (GTK_BOX (outer), ((tabview *)cv)->b1, 0, 0, 0); } - button = gtkutil_button (outer, GTK_STOCK_CLOSE, NULL, cv_tabs_xclick_cb, + button = gtkutil_button (outer, ICON_CHANVIEW_CLOSE, NULL, cv_tabs_xclick_cb, cv, 0); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_widget_set_can_focus (button, FALSE); diff --git a/src/fe-gtk/dccgui.c b/src/fe-gtk/dccgui.c index 3570930b..092c4865 100644 --- a/src/fe-gtk/dccgui.c +++ b/src/fe-gtk/dccgui.c @@ -37,6 +37,19 @@ #include "palette.h" #include "maingui.h" +#if HAVE_GTK3 +#define ICON_DCC_CANCEL "dialog-cancel" +#define ICON_DCC_ACCEPT "dialog-apply" +#define ICON_DCC_RESUME "view-refresh" +#define ICON_DCC_CLEAR "edit-clear" +#endif +#if !HAVE_GTK3 +#define ICON_DCC_CANCEL GTK_STOCK_CANCEL +#define ICON_DCC_ACCEPT GTK_STOCK_APPLY +#define ICON_DCC_RESUME GTK_STOCK_REFRESH +#define ICON_DCC_CLEAR GTK_STOCK_CLEAR +#endif + enum /* DCC SEND/RECV */ { @@ -899,10 +912,10 @@ fe_dcc_open_recv_win (int passive) gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD); gtk_box_pack_end (GTK_BOX (vbox), bbox, FALSE, FALSE, 2); - dccfwin.abort_button = gtkutil_button (bbox, GTK_STOCK_CANCEL, 0, abort_clicked, 0, _("Abort")); - dccfwin.accept_button = gtkutil_button (bbox, GTK_STOCK_APPLY, 0, accept_clicked, 0, _("Accept")); - dccfwin.resume_button = gtkutil_button (bbox, GTK_STOCK_REFRESH, 0, resume_clicked, 0, _("Resume")); - dccfwin.clear_button = gtkutil_button (bbox, GTK_STOCK_CLEAR, 0, clear_completed, 0, _("Clear")); + dccfwin.abort_button = gtkutil_button (bbox, ICON_DCC_CANCEL, 0, abort_clicked, 0, _("Abort")); + dccfwin.accept_button = gtkutil_button (bbox, ICON_DCC_ACCEPT, 0, accept_clicked, 0, _("Accept")); + dccfwin.resume_button = gtkutil_button (bbox, ICON_DCC_RESUME, 0, resume_clicked, 0, _("Resume")); + dccfwin.clear_button = gtkutil_button (bbox, ICON_DCC_CLEAR, 0, clear_completed, 0, _("Clear")); dccfwin.open_button = gtkutil_button (bbox, 0, 0, browse_dcc_folder, 0, _("Open Folder...")); gtk_widget_set_sensitive (dccfwin.accept_button, FALSE); gtk_widget_set_sensitive (dccfwin.resume_button, FALSE); @@ -1100,8 +1113,8 @@ fe_dcc_open_chat_win (int passive) gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD); gtk_box_pack_end (GTK_BOX (vbox), bbox, FALSE, FALSE, 2); - dcccwin.abort_button = gtkutil_button (bbox, GTK_STOCK_CANCEL, 0, abort_chat_clicked, 0, _("Abort")); - dcccwin.accept_button = gtkutil_button (bbox, GTK_STOCK_APPLY, 0, accept_chat_clicked, 0, _("Accept")); + dcccwin.abort_button = gtkutil_button (bbox, ICON_DCC_CANCEL, 0, abort_chat_clicked, 0, _("Abort")); + dcccwin.accept_button = gtkutil_button (bbox, ICON_DCC_ACCEPT, 0, accept_chat_clicked, 0, _("Accept")); gtk_widget_set_sensitive (dcccwin.accept_button, FALSE); gtk_widget_set_sensitive (dcccwin.abort_button, FALSE); diff --git a/src/fe-gtk/editlist.c b/src/fe-gtk/editlist.c index f1ac1a81..f479a37b 100644 --- a/src/fe-gtk/editlist.c +++ b/src/fe-gtk/editlist.c @@ -42,6 +42,19 @@ #include "maingui.h" #include "editlist.h" +#if HAVE_GTK3 +#define ICON_EDITLIST_NEW "document-new" +#define ICON_EDITLIST_DELETE "edit-delete" +#define ICON_EDITLIST_CANCEL "dialog-cancel" +#define ICON_EDITLIST_SAVE "document-save" +#endif +#if !HAVE_GTK3 +#define ICON_EDITLIST_NEW GTK_STOCK_NEW +#define ICON_EDITLIST_DELETE GTK_STOCK_DELETE +#define ICON_EDITLIST_CANCEL GTK_STOCK_CANCEL +#define ICON_EDITLIST_SAVE GTK_STOCK_SAVE +#endif + enum { NAME_COLUMN, @@ -354,13 +367,13 @@ editlist_gui_open (char *title1, char *title2, GSList *list, char *title, char * gtk_container_set_border_width (GTK_CONTAINER (box), 5); gtk_widget_show (box); - gtkutil_button (box, GTK_STOCK_NEW, 0, editlist_add, + gtkutil_button (box, ICON_EDITLIST_NEW, 0, editlist_add, NULL, _("Add")); - gtkutil_button (box, GTK_STOCK_DELETE, 0, editlist_delete, + gtkutil_button (box, ICON_EDITLIST_DELETE, 0, editlist_delete, NULL, _("Delete")); - gtkutil_button (box, GTK_STOCK_CANCEL, 0, editlist_close, + gtkutil_button (box, ICON_EDITLIST_CANCEL, 0, editlist_close, NULL, _("Cancel")); - gtkutil_button (box, GTK_STOCK_SAVE, 0, editlist_save, + gtkutil_button (box, ICON_EDITLIST_SAVE, 0, editlist_save, file, _("Save")); store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (view))); diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c index 914c0283..e9b6b2c0 100644 --- a/src/fe-gtk/fkeys.c +++ b/src/fe-gtk/fkeys.c @@ -53,6 +53,19 @@ #include "textgui.h" #include "fkeys.h" +#if HAVE_GTK3 +#define ICON_FKEYS_NEW "document-new" +#define ICON_FKEYS_DELETE "edit-delete" +#define ICON_FKEYS_CANCEL "dialog-cancel" +#define ICON_FKEYS_SAVE "document-save" +#endif +#if !HAVE_GTK3 +#define ICON_FKEYS_NEW GTK_STOCK_NEW +#define ICON_FKEYS_DELETE GTK_STOCK_DELETE +#define ICON_FKEYS_CANCEL GTK_STOCK_CANCEL +#define ICON_FKEYS_SAVE GTK_STOCK_SAVE +#endif + static void replace_handle (GtkWidget * wid); void key_check_replace_on_change (GtkEditable *editable, gpointer data); void key_action_tab_clean (void); @@ -830,13 +843,13 @@ key_dialog_show () gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, FALSE, 2); gtk_container_set_border_width (GTK_CONTAINER (box), 5); - gtkutil_button (box, GTK_STOCK_NEW, NULL, key_dialog_add, + gtkutil_button (box, ICON_FKEYS_NEW, NULL, key_dialog_add, NULL, _("Add")); - gtkutil_button (box, GTK_STOCK_DELETE, NULL, key_dialog_delete, + gtkutil_button (box, ICON_FKEYS_DELETE, NULL, key_dialog_delete, NULL, _("Delete")); - gtkutil_button (box, GTK_STOCK_CANCEL, NULL, key_dialog_close, + gtkutil_button (box, ICON_FKEYS_CANCEL, NULL, key_dialog_close, NULL, _("Cancel")); - gtkutil_button (box, GTK_STOCK_SAVE, NULL, key_dialog_save, + gtkutil_button (box, ICON_FKEYS_SAVE, NULL, key_dialog_save, NULL, _("Save")); store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (view))); diff --git a/src/fe-gtk/ignoregui.c b/src/fe-gtk/ignoregui.c index e64f322e..339b1b0b 100644 --- a/src/fe-gtk/ignoregui.c +++ b/src/fe-gtk/ignoregui.c @@ -31,6 +31,17 @@ #include "gtkutil.h" #include "maingui.h" +#if HAVE_GTK3 +#define ICON_IGNORE_NEW "document-new" +#define ICON_IGNORE_DELETE "edit-delete" +#define ICON_IGNORE_CLEAR "edit-clear" +#endif +#if !HAVE_GTK3 +#define ICON_IGNORE_NEW GTK_STOCK_NEW +#define ICON_IGNORE_DELETE GTK_STOCK_DELETE +#define ICON_IGNORE_CLEAR GTK_STOCK_CLEAR +#endif + enum { MASK_COLUMN, @@ -383,11 +394,11 @@ ignore_gui_open () gtk_container_set_border_width (GTK_CONTAINER (box), 5); gtk_widget_show (box); - gtkutil_button (box, GTK_STOCK_NEW, 0, ignore_new_entry_clicked, 0, + gtkutil_button (box, ICON_IGNORE_NEW, 0, ignore_new_entry_clicked, 0, _("Add...")); - gtkutil_button (box, GTK_STOCK_DELETE, 0, ignore_delete_entry_clicked, + gtkutil_button (box, ICON_IGNORE_DELETE, 0, ignore_delete_entry_clicked, 0, _("Delete")); - gtkutil_button (box, GTK_STOCK_CLEAR, 0, ignore_clear_entry_clicked, + gtkutil_button (box, ICON_IGNORE_CLEAR, 0, ignore_clear_entry_clicked, 0, _("Clear")); store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (view))); diff --git a/src/fe-gtk/joind.c b/src/fe-gtk/joind.c index 4ddedf96..2edf0e92 100644 --- a/src/fe-gtk/joind.c +++ b/src/fe-gtk/joind.c @@ -40,6 +40,13 @@ #include "chanlist.h" #include "gtkutil.h" +#if HAVE_GTK3 +#define ICON_JOIND_NETWORK "network-workgroup" +#endif +#if !HAVE_GTK3 +#define ICON_JOIND_NETWORK GTK_STOCK_NETWORK +#endif + static void joind_radio2_cb (GtkWidget *radio, server *serv) @@ -158,7 +165,7 @@ joind_show_dialog (server *serv) gtk_widget_show (hbox1); gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0); - image1 = gtkutil_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_LARGE_TOOLBAR); + image1 = gtkutil_image_new_from_stock (ICON_JOIND_NETWORK, GTK_ICON_SIZE_LARGE_TOOLBAR); gtk_widget_show (image1); gtk_box_pack_start (GTK_BOX (hbox1), image1, FALSE, TRUE, 24); #if HAVE_GTK3 diff --git a/src/fe-gtk/notifygui.c b/src/fe-gtk/notifygui.c index ef31e895..0dfa8bda 100644 --- a/src/fe-gtk/notifygui.c +++ b/src/fe-gtk/notifygui.c @@ -37,6 +37,19 @@ #include "palette.h" #include "notifygui.h" +#if HAVE_GTK3 +#define ICON_NOTIFY_NEW "document-new" +#define ICON_NOTIFY_DELETE "edit-delete" +#define LABEL_NOTIFY_CANCEL _("_Cancel") +#define LABEL_NOTIFY_OK _("_OK") +#endif +#if !HAVE_GTK3 +#define ICON_NOTIFY_NEW GTK_STOCK_NEW +#define ICON_NOTIFY_DELETE GTK_STOCK_DELETE +#define LABEL_NOTIFY_CANCEL GTK_STOCK_CANCEL +#define LABEL_NOTIFY_OK GTK_STOCK_OK +#endif + /* model for the notify treeview */ enum @@ -373,8 +386,8 @@ fe_notify_ask (char *nick, char *networks) char buf[256]; dialog = gtk_dialog_new_with_buttons (msg, NULL, 0, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + LABEL_NOTIFY_CANCEL, GTK_RESPONSE_REJECT, + LABEL_NOTIFY_OK, GTK_RESPONSE_ACCEPT, NULL); if (parent_window) gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent_window)); @@ -450,11 +463,11 @@ notify_opengui (void) gtk_box_pack_end (GTK_BOX (vbox), bbox, 0, 0, 0); gtk_widget_show (bbox); - gtkutil_button (bbox, GTK_STOCK_NEW, 0, notify_add_clicked, 0, + gtkutil_button (bbox, ICON_NOTIFY_NEW, 0, notify_add_clicked, 0, _("Add...")); notify_button_remove = - gtkutil_button (bbox, GTK_STOCK_DELETE, 0, notify_remove_clicked, 0, + gtkutil_button (bbox, ICON_NOTIFY_DELETE, 0, notify_remove_clicked, 0, _("Remove")); notify_button_opendialog = diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c index 6acb8282..5e84afa1 100644 --- a/src/fe-gtk/plugin-tray.c +++ b/src/fe-gtk/plugin-tray.c @@ -31,6 +31,15 @@ #include "menu.h" #include "gtkutil.h" +#if HAVE_GTK3 +#define ICON_TRAY_PREFERENCES "preferences-system" +#define ICON_TRAY_QUIT "application-exit" +#endif +#if !HAVE_GTK3 +#define ICON_TRAY_PREFERENCES GTK_STOCK_PREFERENCES +#define ICON_TRAY_QUIT GTK_STOCK_QUIT +#endif + #ifndef WIN32 #include #endif @@ -574,9 +583,9 @@ tray_menu_cb (GtkWidget *widget, guint button, guint time, gpointer userdata) menu_add_plugin_items (menu, "\x5$TRAY", NULL); tray_make_item (menu, NULL, tray_menu_quit_cb, NULL); - mg_create_icon_item (_("_Preferences"), GTK_STOCK_PREFERENCES, menu, tray_menu_settings, NULL); + mg_create_icon_item (_("_Preferences"), ICON_TRAY_PREFERENCES, menu, tray_menu_settings, NULL); tray_make_item (menu, NULL, tray_menu_quit_cb, NULL); - mg_create_icon_item (_("_Quit"), GTK_STOCK_QUIT, menu, tray_menu_quit_cb, NULL); + mg_create_icon_item (_("_Quit"), ICON_TRAY_QUIT, menu, tray_menu_quit_cb, NULL); g_object_ref (menu); g_object_ref_sink (menu); diff --git a/src/fe-gtk/rawlog.c b/src/fe-gtk/rawlog.c index 284b5c6d..e5a2e125 100644 --- a/src/fe-gtk/rawlog.c +++ b/src/fe-gtk/rawlog.c @@ -42,6 +42,15 @@ #include "xtext.h" #include "fkeys.h" +#if HAVE_GTK3 +#define ICON_RAWLOG_CLEAR "edit-clear" +#define ICON_RAWLOG_SAVE_AS "document-save-as" +#endif +#if !HAVE_GTK3 +#define ICON_RAWLOG_CLEAR GTK_STOCK_CLEAR +#define ICON_RAWLOG_SAVE_AS GTK_STOCK_SAVE_AS +#endif + static void close_rawlog (GtkWidget *wid, server *serv) { @@ -131,10 +140,10 @@ open_rawlog (struct server *serv) gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD); gtk_box_pack_end (GTK_BOX (vbox), bbox, 0, 0, 4); - gtkutil_button (bbox, GTK_STOCK_CLEAR, NULL, rawlog_clearbutton, + gtkutil_button (bbox, ICON_RAWLOG_CLEAR, NULL, rawlog_clearbutton, serv, _("Clear Raw Log")); - gtkutil_button (bbox, GTK_STOCK_SAVE_AS, NULL, rawlog_savebutton, + gtkutil_button (bbox, ICON_RAWLOG_SAVE_AS, NULL, rawlog_savebutton, serv, _("Save As...")); /* Copy selection to clipboard when Ctrl+Shift+C is pressed AND text auto-copy is disabled */ diff --git a/src/fe-gtk/textgui.c b/src/fe-gtk/textgui.c index 1e9e956f..08d28d8e 100644 --- a/src/fe-gtk/textgui.c +++ b/src/fe-gtk/textgui.c @@ -38,6 +38,17 @@ #include "palette.h" #include "textgui.h" +#if HAVE_GTK3 +#define ICON_TEXTEVENT_SAVE_AS "document-save-as" +#define ICON_TEXTEVENT_OPEN "document-open" +#define ICON_TEXTEVENT_OK "dialog-ok" +#endif +#if !HAVE_GTK3 +#define ICON_TEXTEVENT_SAVE_AS GTK_STOCK_SAVE_AS +#define ICON_TEXTEVENT_OPEN GTK_STOCK_OPEN +#define ICON_TEXTEVENT_OK GTK_STOCK_OK +#endif + extern struct text_event te[]; extern char *pntevts_text[]; extern char *pntevts[]; @@ -473,13 +484,13 @@ pevent_dialog_show () hbox = gtk_hbutton_box_new (); gtk_button_box_set_layout (GTK_BUTTON_BOX (hbox), GTK_BUTTONBOX_SPREAD); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 4); - gtkutil_button (hbox, GTK_STOCK_SAVE_AS, NULL, pevent_save_cb, + gtkutil_button (hbox, ICON_TEXTEVENT_SAVE_AS, NULL, pevent_save_cb, (void *) 1, _("Save As...")); - gtkutil_button (hbox, GTK_STOCK_OPEN, NULL, pevent_load_cb, + gtkutil_button (hbox, ICON_TEXTEVENT_OPEN, NULL, pevent_load_cb, NULL, _("Load From...")); gtkutil_button (hbox, NULL, NULL, pevent_test_cb, pevent_dialog_twid, _("Test All")); - gtkutil_button (hbox, GTK_STOCK_OK, NULL, pevent_ok_cb, + gtkutil_button (hbox, ICON_TEXTEVENT_OK, NULL, pevent_ok_cb, NULL, _("OK")); gtk_widget_show_all (pevent_dialog); diff --git a/src/fe-gtk/urlgrab.c b/src/fe-gtk/urlgrab.c index 4d520959..e6d20e2d 100644 --- a/src/fe-gtk/urlgrab.c +++ b/src/fe-gtk/urlgrab.c @@ -33,6 +33,17 @@ #include "maingui.h" #include "urlgrab.h" +#if HAVE_GTK3 +#define ICON_URLGRAB_CLEAR "edit-clear" +#define ICON_URLGRAB_COPY "edit-copy" +#define ICON_URLGRAB_SAVE_AS "document-save-as" +#endif +#if !HAVE_GTK3 +#define ICON_URLGRAB_CLEAR GTK_STOCK_CLEAR +#define ICON_URLGRAB_COPY GTK_STOCK_COPY +#define ICON_URLGRAB_SAVE_AS GTK_STOCK_SAVE_AS +#endif + /* model for the URL treeview */ enum { @@ -210,11 +221,11 @@ url_opengui () gtk_box_pack_end (GTK_BOX (vbox), hbox, 0, 0, 0); gtk_widget_show (hbox); - gtkutil_button (hbox, GTK_STOCK_CLEAR, + gtkutil_button (hbox, ICON_URLGRAB_CLEAR, _("Clear list"), url_button_clear, 0, _("Clear")); - gtkutil_button (hbox, GTK_STOCK_COPY, + gtkutil_button (hbox, ICON_URLGRAB_COPY, _("Copy selected URL"), url_button_copy, view, _("Copy")); - gtkutil_button (hbox, GTK_STOCK_SAVE_AS, + gtkutil_button (hbox, ICON_URLGRAB_SAVE_AS, _("Save list to a file"), url_button_save, 0, _("Save As...")); gtk_widget_show (urlgrabberwindow);