Skip to content

Commit 70a6011

Browse files
sc0wraveit65
sc0w
authored and
raveit65
committed
avoid deprecated GtkStock
1 parent dab6502 commit 70a6011

19 files changed

+175
-88
lines changed

‎baobab/src/baobab-chart.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,9 +1728,9 @@ baobab_chart_save_snapshot (GtkWidget *chart)
17281728
fs_dlg = gtk_file_chooser_dialog_new (_("Save Snapshot"),
17291729
NULL,
17301730
GTK_FILE_CHOOSER_ACTION_SAVE,
1731-
GTK_STOCK_CANCEL,
1731+
"gtk-cancel",
17321732
GTK_RESPONSE_CANCEL,
1733-
GTK_STOCK_SAVE,
1733+
"gtk-save",
17341734
GTK_RESPONSE_ACCEPT, NULL);
17351735

17361736
item = (BaobabChartItem *) priv->first_item->data;

‎baobab/src/baobab-remote-connect-dialog.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ baobab_remote_connect_dialog_init (BaobabRemoteConnectDialog *dialog)
723723
setup_for_type (dialog);
724724

725725
gtk_dialog_add_button (GTK_DIALOG (dialog),
726-
GTK_STOCK_CANCEL,
726+
"gtk-cancel",
727727
GTK_RESPONSE_CANCEL);
728728
gtk_dialog_add_button (GTK_DIALOG (dialog),
729729
_("_Scan"),

‎baobab/src/baobab-utils.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ dir_select (gboolean SEARCH, GtkWidget *parent)
106106
file_chooser = gtk_file_chooser_dialog_new (_("Select Folder"),
107107
GTK_WINDOW (parent),
108108
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
109-
GTK_STOCK_CANCEL,
109+
"gtk-cancel",
110110
GTK_RESPONSE_CANCEL,
111-
GTK_STOCK_OPEN,
111+
"gtk-open",
112112
GTK_RESPONSE_OK, NULL);
113113

114114
gtk_file_chooser_set_show_hidden (GTK_FILE_CHOOSER (file_chooser), FALSE);

‎gsearchtool/src/gsearchtool-callbacks.c‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,12 @@ display_dialog_file_open_limit (GtkWidget * window,
369369
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
370370
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14);
371371

372-
button = gtk_button_new_from_stock ("gtk-open");
372+
button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
373+
"label", "gtk-open",
374+
"use-stock", TRUE,
375+
"use-underline", TRUE,
376+
NULL));
377+
373378
gtk_widget_set_can_default (button, TRUE);
374379
gtk_widget_show (button);
375380

@@ -566,7 +571,12 @@ display_dialog_folder_open_limit (GtkWidget * window,
566571
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
567572
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14);
568573

569-
button = gtk_button_new_from_stock ("gtk-open");
574+
button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
575+
"label", "gtk-open",
576+
"use-stock", TRUE,
577+
"use-underline", TRUE,
578+
NULL));
579+
570580
gtk_widget_set_can_default (button, TRUE);
571581
gtk_widget_show (button);
572582

@@ -746,7 +756,12 @@ display_dialog_delete_permanently (GtkWidget * window,
746756
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
747757
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14);
748758

749-
button = gtk_button_new_from_stock ("gtk-delete");
759+
button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
760+
"label", "gtk-delete",
761+
"use-stock", TRUE,
762+
"use-underline", TRUE,
763+
NULL));
764+
750765
gtk_widget_set_can_default (button, TRUE);
751766
gtk_widget_show (button);
752767

@@ -1094,7 +1109,7 @@ build_popup_menu_for_file (GSearchWindow * gsearch,
10941109
gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (new1), file_icon != NULL);
10951110

10961111
if (file_icon == NULL) {
1097-
file_icon = g_themed_icon_new (GTK_STOCK_OPEN);
1112+
file_icon = g_themed_icon_new ("gtk-open");
10981113
}
10991114

11001115
image1 = gtk_image_new_from_gicon (file_icon, GTK_ICON_SIZE_MENU);
@@ -1132,7 +1147,7 @@ build_popup_menu_for_file (GSearchWindow * gsearch,
11321147
gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (new1), file_icon != NULL);
11331148

11341149
if (file_icon == NULL) {
1135-
file_icon = g_themed_icon_new (GTK_STOCK_OPEN);
1150+
file_icon = g_themed_icon_new ("gtk-open");
11361151
}
11371152

11381153
image1 = gtk_image_new_from_gicon (file_icon, GTK_ICON_SIZE_MENU);
@@ -1167,7 +1182,7 @@ build_popup_menu_for_file (GSearchWindow * gsearch,
11671182
gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (new1), file_icon != NULL);
11681183

11691184
if (file_icon == NULL) {
1170-
file_icon = g_themed_icon_new (GTK_STOCK_OPEN);
1185+
file_icon = g_themed_icon_new ("gtk-open");
11711186
}
11721187

11731188
image1 = gtk_image_new_from_gicon (file_icon, GTK_ICON_SIZE_MENU);
@@ -1514,7 +1529,7 @@ drag_begin_file_cb (GtkWidget * widget,
15141529
number_of_selected_rows = gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection));
15151530

15161531
if (number_of_selected_rows > 1) {
1517-
gtk_drag_set_icon_stock (context, GTK_STOCK_DND_MULTIPLE, 0, 0);
1532+
gtk_drag_set_icon_stock (context, "gtk-dnd-multiple", 0, 0);
15181533
}
15191534
else if (number_of_selected_rows == 1) {
15201535
GdkPixbuf * pixbuf;
@@ -1538,7 +1553,7 @@ drag_begin_file_cb (GtkWidget * widget,
15381553
gtk_drag_set_icon_pixbuf (context, pixbuf, 0, 0);
15391554
}
15401555
else {
1541-
gtk_drag_set_icon_stock (context, GTK_STOCK_DND, 0, 0);
1556+
gtk_drag_set_icon_stock (context, "gtk-dnd", 0, 0);
15421557
}
15431558
}
15441559
}
@@ -1618,8 +1633,8 @@ show_file_selector_cb (GtkAction * action,
16181633
file_chooser = gtk_file_chooser_dialog_new (_("Save Search Results As..."),
16191634
GTK_WINDOW (gsearch->window),
16201635
GTK_FILE_CHOOSER_ACTION_SAVE,
1621-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
1622-
GTK_STOCK_SAVE, GTK_RESPONSE_OK,
1636+
"gtk-cancel", GTK_RESPONSE_CANCEL,
1637+
"gtk-save", GTK_RESPONSE_OK,
16231638
NULL);
16241639

16251640
gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (file_chooser), TRUE);
@@ -1727,7 +1742,7 @@ display_dialog_could_not_save_exists (GtkWidget * window,
17271742
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
17281743
gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14);
17291744

1730-
button = gsearchtool_button_new_with_stock_icon (_("_Replace"), GTK_STOCK_OK);
1745+
button = gsearchtool_button_new_with_icon (_("_Replace"), "gtk-ok");
17311746
gtk_widget_set_can_default (button, TRUE);
17321747
gtk_widget_show (button);
17331748

‎gsearchtool/src/gsearchtool-support.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,8 +1117,8 @@ gsearchtool_get_unique_filename (const gchar * path,
11171117
}
11181118

11191119
GtkWidget *
1120-
gsearchtool_button_new_with_stock_icon (const gchar * string,
1121-
const gchar * stock_id)
1120+
gsearchtool_button_new_with_icon (const gchar * string,
1121+
const gchar * icon_name)
11221122
{
11231123
GtkWidget * button;
11241124
GtkWidget * hbox;
@@ -1128,7 +1128,7 @@ gsearchtool_button_new_with_stock_icon (const gchar * string,
11281128
button = gtk_button_new ();
11291129
label = gtk_label_new_with_mnemonic (string);
11301130
gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button));
1131-
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
1131+
image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
11321132
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
11331133
gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
11341134
gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);

‎gsearchtool/src/gsearchtool-support.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ gchar *
9393
gsearchtool_get_unique_filename (const gchar * path,
9494
const gchar * suffix);
9595
GtkWidget *
96-
gsearchtool_button_new_with_stock_icon (const gchar * string,
97-
const gchar * stock_id);
96+
gsearchtool_button_new_with_icon (const gchar * string,
97+
const gchar * icon_name);
9898
GSList *
9999
gsearchtool_get_columns_order (GtkTreeView * treeview);
100100

‎gsearchtool/src/gsearchtool.c‎

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1798,7 +1798,7 @@ handle_search_command_stderr_io (GIOChannel * ioc,
17981798
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, FALSE, 0);
17991799
gtk_widget_show_all (hbox);
18001800

1801-
button = gsearchtool_button_new_with_stock_icon (_("Disable _Quick Search"), GTK_STOCK_OK);
1801+
button = gsearchtool_button_new_with_icon (_("Disable _Quick Search"), "gtk-ok");
18021802
gtk_widget_set_can_default (button, TRUE);
18031803
gtk_widget_show (button);
18041804

@@ -2051,7 +2051,12 @@ create_constraint_box (GSearchWindow * gsearch,
20512051
break;
20522052
}
20532053

2054-
button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
2054+
button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
2055+
"label", "gtk-remove",
2056+
"use-stock", TRUE,
2057+
"use-underline", TRUE,
2058+
NULL));
2059+
20552060
gtk_widget_set_can_default (button, FALSE);
20562061

20572062
{
@@ -2197,7 +2202,12 @@ create_additional_constraint_section (GSearchWindow * gsearch)
21972202
_("Select a search option from the drop-down list."));
21982203
}
21992204

2200-
gsearch->available_options_add_button = gtk_button_new_from_stock (GTK_STOCK_ADD);
2205+
gsearch->available_options_add_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
2206+
"label", "gtk-add",
2207+
"use-stock", TRUE,
2208+
"use-underline", TRUE,
2209+
NULL));
2210+
22012211
gtk_widget_set_can_default (gsearch->available_options_add_button, FALSE);
22022212
gsearch->available_options_button_size_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH);
22032213
gtk_size_group_add_widget (gsearch->available_options_button_size_group, gsearch->available_options_add_button);
@@ -2877,7 +2887,14 @@ gsearch_app_create (GSearchWindow * gsearch)
28772887
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
28782888

28792889
gtk_box_set_spacing (GTK_BOX (hbox), 6);
2880-
button = gtk_button_new_from_stock (GTK_STOCK_HELP);
2890+
2891+
button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
2892+
"label", "gtk-help",
2893+
"use-stock", TRUE,
2894+
"use-underline", TRUE,
2895+
NULL));
2896+
2897+
28812898
gtk_widget_set_can_default (button, TRUE);
28822899
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
28832900
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (hbox), button, TRUE);
@@ -2887,7 +2904,12 @@ gsearch_app_create (GSearchWindow * gsearch)
28872904
add_atk_namedesc (GTK_WIDGET (button), NULL, _("Click to display the help manual."));
28882905
}
28892906

2890-
button = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
2907+
button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
2908+
"label", "gtk-close",
2909+
"use-stock", TRUE,
2910+
"use-underline", TRUE,
2911+
NULL));
2912+
28912913
gtk_widget_set_can_default (button, TRUE);
28922914
g_signal_connect (G_OBJECT (button), "clicked",
28932915
G_CALLBACK (click_close_cb), (gpointer) gsearch);
@@ -2898,8 +2920,17 @@ gsearch_app_create (GSearchWindow * gsearch)
28982920
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
28992921

29002922
/* Find and Stop buttons... */
2901-
gsearch->find_button = gtk_button_new_from_stock (GTK_STOCK_FIND);
2902-
gsearch->stop_button = gtk_button_new_from_stock (GTK_STOCK_STOP);
2923+
gsearch->find_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
2924+
"label", "gtk-find",
2925+
"use-stock", TRUE,
2926+
"use-underline", TRUE,
2927+
NULL));
2928+
2929+
gsearch->stop_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
2930+
"label", "gtk-stop",
2931+
"use-stock", TRUE,
2932+
"use-underline", TRUE,
2933+
NULL));
29032934

29042935
gtk_widget_set_can_default (gsearch->find_button, TRUE);
29052936
gtk_widget_set_can_default (gsearch->stop_button, TRUE);

‎logview/src/logview-filter-manager.c‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ logview_filter_manager_init (LogviewFilterManager *manager)
468468
priv->prefs = logview_prefs_get ();
469469

470470
gtk_dialog_add_button (GTK_DIALOG(manager),
471-
GTK_STOCK_CLOSE,
471+
"gtk-close",
472472
GTK_RESPONSE_CLOSE);
473473
gtk_window_set_modal (GTK_WINDOW (manager),
474474
TRUE);
@@ -502,9 +502,23 @@ logview_filter_manager_init (LogviewFilterManager *manager)
502502
gtk_tree_view_append_column (GTK_TREE_VIEW (priv->tree),
503503
column);
504504

505-
priv->add_button = gtk_button_new_from_stock (GTK_STOCK_ADD);
506-
priv->edit_button = gtk_button_new_from_stock (GTK_STOCK_PROPERTIES);
507-
priv->remove_button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
505+
priv->add_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
506+
"label", "gtk-add",
507+
"use-stock", TRUE,
508+
"use-underline", TRUE,
509+
NULL));
510+
511+
priv->edit_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
512+
"label", "gtk-properties",
513+
"use-stock", TRUE,
514+
"use-underline", TRUE,
515+
NULL));
516+
517+
priv->remove_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
518+
"label", "gtk-remove",
519+
"use-stock", TRUE,
520+
"use-underline", TRUE,
521+
NULL));
508522

509523
gtk_window_set_title (GTK_WINDOW (manager),
510524
_("Filters"));

‎logview/src/logview-findbar.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ logview_findbar_init (LogviewFindbar *findbar)
200200
gtk_widget_show_all (GTK_WIDGET (priv->forward_button));
201201

202202
/* clear button */
203-
priv->clear_button = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR);
203+
priv->clear_button = gtk_tool_button_new_from_stock ("gtk-clear");
204204
gtk_tool_item_set_tooltip_text (priv->clear_button,
205205
_("Clear the search string"));
206206
gtk_toolbar_insert (gtoolbar, priv->clear_button, -1);

‎logview/src/logview-window.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,8 @@ logview_open_log (GtkAction *action, LogviewWindow *logview)
325325
chooser = gtk_file_chooser_dialog_new (_("Open Log"),
326326
GTK_WINDOW (logview),
327327
GTK_FILE_CHOOSER_ACTION_OPEN,
328-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
329-
GTK_STOCK_OPEN, GTK_RESPONSE_OK,
328+
"gtk-cancel", GTK_RESPONSE_CANCEL,
329+
"gtk-open", GTK_RESPONSE_OK,
330330
NULL);
331331
gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_OK);
332332
gtk_window_set_modal (GTK_WINDOW (chooser), TRUE);
@@ -819,33 +819,33 @@ static GtkActionEntry entries[] = {
819819
{ "FilterMenu", NULL, N_("_Filters"), NULL, NULL, NULL },
820820
{ "HelpMenu", NULL, N_("_Help"), NULL, NULL, NULL },
821821

822-
{ "OpenLog", GTK_STOCK_OPEN, N_("_Open..."), "<control>O", N_("Open a log from file"),
822+
{ "OpenLog", "document-open", N_("_Open..."), "<control>O", N_("Open a log from file"),
823823
G_CALLBACK (logview_open_log) },
824-
{ "CloseLog", GTK_STOCK_CLOSE, N_("_Close"), "<control>W", N_("Close this log"),
824+
{ "CloseLog", "window-close", N_("_Close"), "<control>W", N_("Close this log"),
825825
G_CALLBACK (logview_close_log) },
826-
{ "Quit", GTK_STOCK_QUIT, N_("_Quit"), "<control>Q", N_("Quit the log viewer"),
826+
{ "Quit", "application-exit", N_("_Quit"), "<control>Q", N_("Quit the log viewer"),
827827
G_CALLBACK (gtk_main_quit) },
828828

829-
{ "Copy", GTK_STOCK_COPY, N_("_Copy"), "<control>C", N_("Copy the selection"),
829+
{ "Copy", "edit-copy", N_("_Copy"), "<control>C", N_("Copy the selection"),
830830
G_CALLBACK (logview_copy) },
831831
{ "SelectAll", NULL, N_("Select _All"), "<Control>A", N_("Select the entire log"),
832832
G_CALLBACK (logview_select_all) },
833-
{ "Search", GTK_STOCK_FIND, N_("_Find..."), "<control>F", N_("Find a word or phrase in the log"),
833+
{ "Search", "edit-find", N_("_Find..."), "<control>F", N_("Find a word or phrase in the log"),
834834
G_CALLBACK (logview_search) },
835835

836-
{ "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "<control>plus", N_("Bigger text size"),
836+
{ "ViewZoomIn", "zoom-in", N_("Zoom _In"), "<control>plus", N_("Bigger text size"),
837837
G_CALLBACK (logview_bigger_text)},
838-
{ "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "<control>minus", N_("Smaller text size"),
838+
{ "ViewZoomOut", "zoom-out", N_("Zoom _Out"), "<control>minus", N_("Smaller text size"),
839839
G_CALLBACK (logview_smaller_text)},
840-
{ "ViewZoom100", GTK_STOCK_ZOOM_100, NULL, "<control>0", N_("Normal text size"),
840+
{ "ViewZoom100", "zoom-original", N_("_Normal Size"), "<control>0", N_("Normal text size"),
841841
G_CALLBACK (logview_normal_text)},
842842

843843
{ "FilterManage", NULL, N_("Manage Filters"), NULL, N_("Manage filters"),
844844
G_CALLBACK (logview_manage_filters)},
845845

846-
{ "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", N_("Open the help contents for the log viewer"),
846+
{ "HelpContents", "help-browser", N_("_Contents"), "F1", N_("Open the help contents for the log viewer"),
847847
G_CALLBACK (logview_help) },
848-
{ "AboutAction", GTK_STOCK_ABOUT, N_("_About"), NULL, N_("Show the about dialog for the log viewer"),
848+
{ "AboutAction", "help-about", N_("_About"), NULL, N_("Show the about dialog for the log viewer"),
849849
G_CALLBACK (logview_about) },
850850
};
851851

@@ -1364,7 +1364,7 @@ logview_window_init (LogviewWindow *logview)
13641364
priv->message_area = gtk_info_bar_new ();
13651365
message_area_create_error_box (logview, priv->message_area);
13661366
gtk_info_bar_add_button (GTK_INFO_BAR (priv->message_area),
1367-
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
1367+
"gtk-close", GTK_RESPONSE_CLOSE);
13681368
gtk_box_pack_start (GTK_BOX (main_view), priv->message_area, FALSE, FALSE, 0);
13691369

13701370
/* second pane: text view */

0 commit comments

Comments
 (0)