Skip to content

Commit 2e9c1a1

Browse files
sc0wraveit65
sc0w
authored and
raveit65
committed
avoid deprecated GtkStock
1 parent b5651bb commit 2e9c1a1

9 files changed

+110
-110
lines changed

‎src/actions.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -382,8 +382,8 @@ activate_action_open (GtkAction *action,
382382
file_sel = gtk_file_chooser_dialog_new (_("Open"),
383383
GTK_WINDOW (window),
384384
GTK_FILE_CHOOSER_ACTION_OPEN,
385-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
386-
GTK_STOCK_OPEN, GTK_RESPONSE_OK,
385+
"gtk-cancel", GTK_RESPONSE_CANCEL,
386+
"gtk-open", GTK_RESPONSE_OK,
387387
NULL);
388388
gtk_dialog_set_default_response (GTK_DIALOG (file_sel), GTK_RESPONSE_OK);
389389
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (file_sel), FALSE);

‎src/dlg-add-files.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ add_files_cb (GtkWidget *widget,
152152
gtk_file_chooser_dialog_new (_("Add Files"),
153153
GTK_WINDOW (data->window),
154154
GTK_FILE_CHOOSER_ACTION_OPEN,
155-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
155+
"gtk-cancel", GTK_RESPONSE_CANCEL,
156156
FR_STOCK_ADD_FILES, GTK_RESPONSE_OK,
157-
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
157+
"gtk-help", GTK_RESPONSE_HELP,
158158
NULL);
159159

160160
gtk_window_set_default_size (GTK_WINDOW (data->dialog), 530, 450);

‎src/dlg-add-folder.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,9 @@ add_folder_cb (GtkWidget *widget,
223223
gtk_file_chooser_dialog_new (_("Add a Folder"),
224224
GTK_WINDOW (data->window),
225225
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
226-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
226+
"gtk-cancel", GTK_RESPONSE_CANCEL,
227227
FR_STOCK_ADD_FOLDER, GTK_RESPONSE_OK,
228-
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
228+
"gtk-help", GTK_RESPONSE_HELP,
229229
NULL);
230230

231231
gtk_window_set_default_size (GTK_WINDOW (data->dialog), 530, 510);
@@ -878,8 +878,8 @@ save_options_cb (GtkWidget *w,
878878
_("_Options Name:"),
879879
(data->last_options != NULL) ? data->last_options : "",
880880
1024,
881-
GTK_STOCK_CANCEL,
882-
GTK_STOCK_SAVE);
881+
"gtk-cancel",
882+
"gtk-save");
883883
if (opt_filename == NULL)
884884
return;
885885

‎src/dlg-batch-add.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,10 @@ add_clicked_cb (GtkWidget *widget,
228228

229229
d = _gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("dialog")),
230230
GTK_DIALOG_MODAL,
231-
GTK_STOCK_DIALOG_QUESTION,
231+
"dialog-question",
232232
msg,
233233
NULL,
234-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
234+
"gtk-cancel", GTK_RESPONSE_CANCEL,
235235
_("Create _Folder"), GTK_RESPONSE_YES,
236236
NULL);
237237

@@ -267,10 +267,10 @@ add_clicked_cb (GtkWidget *widget,
267267

268268
d = _gtk_message_dialog_new (GTK_WINDOW (window),
269269
GTK_DIALOG_DESTROY_WITH_PARENT,
270-
GTK_STOCK_DIALOG_WARNING,
270+
"dialog-warning",
271271
_("Archive not created"),
272272
NULL,
273-
GTK_STOCK_OK, GTK_RESPONSE_OK,
273+
"gtk-ok", GTK_RESPONSE_OK,
274274
NULL);
275275
gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK);
276276
gtk_dialog_run (GTK_DIALOG (d));
@@ -315,10 +315,10 @@ add_clicked_cb (GtkWidget *widget,
315315

316316
d = _gtk_message_dialog_new (GTK_WINDOW (GET_WIDGET ("dialog")),
317317
GTK_DIALOG_MODAL,
318-
GTK_STOCK_DIALOG_QUESTION,
318+
"dialog-question",
319319
_("The archive is already present. Do you want to overwrite it?"),
320320
NULL,
321-
GTK_STOCK_NO, GTK_RESPONSE_NO,
321+
"gtk-no", GTK_RESPONSE_NO,
322322
_("_Overwrite"), GTK_RESPONSE_YES,
323323
NULL);
324324

‎src/dlg-extract.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ extract_cb (GtkWidget *w,
106106

107107
d = _gtk_message_dialog_new (GTK_WINDOW (data->dialog),
108108
GTK_DIALOG_MODAL,
109-
GTK_STOCK_DIALOG_QUESTION,
109+
"dialog-question",
110110
msg,
111111
NULL,
112-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
112+
"gtk-cancel", GTK_RESPONSE_CANCEL,
113113
_("Create _Folder"), GTK_RESPONSE_YES,
114114
NULL);
115115

@@ -146,10 +146,10 @@ extract_cb (GtkWidget *w,
146146

147147
d = _gtk_message_dialog_new (GTK_WINDOW (window),
148148
GTK_DIALOG_DESTROY_WITH_PARENT,
149-
GTK_STOCK_DIALOG_WARNING,
149+
"dialog-warning",
150150
_("Extraction not performed"),
151151
NULL,
152-
GTK_STOCK_OK, GTK_RESPONSE_OK,
152+
"gtk-ok", GTK_RESPONSE_OK,
153153
NULL);
154154
gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK);
155155
gtk_dialog_run (GTK_DIALOG (d));
@@ -423,9 +423,9 @@ dlg_extract__common (FrWindow *window,
423423
gtk_file_chooser_dialog_new (_("Extract"),
424424
GTK_WINDOW (data->window),
425425
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
426-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
426+
"gtk-cancel", GTK_RESPONSE_CANCEL,
427427
FR_STOCK_EXTRACT, GTK_RESPONSE_OK,
428-
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
428+
"gtk-help", GTK_RESPONSE_HELP,
429429
NULL);
430430

431431
gtk_window_set_default_size (GTK_WINDOW (file_sel), 530, 510);

‎src/fr-window.c

+25-25
Original file line numberDiff line numberDiff line change
@@ -2525,12 +2525,12 @@ create_the_progress_dialog (FrWindow *window)
25252525
NULL,
25262526
NULL);
25272527

2528-
window->priv->pd_quit_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), GTK_STOCK_QUIT, DIALOG_RESPONSE_QUIT);
2528+
window->priv->pd_quit_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), "gtk-quit", DIALOG_RESPONSE_QUIT);
25292529
window->priv->pd_open_archive_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), _("_Open the Archive"), DIALOG_RESPONSE_OPEN_ARCHIVE);
25302530
window->priv->pd_open_destination_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), _("_Show the Files"), DIALOG_RESPONSE_OPEN_DESTINATION_FOLDER);
25312531
window->priv->pd_open_destination_and_quit_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), _("Show the _Files and Quit"), DIALOG_RESPONSE_OPEN_DESTINATION_FOLDER_AND_QUIT);
2532-
window->priv->pd_close_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
2533-
window->priv->pd_cancel_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
2532+
window->priv->pd_close_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), "gtk-close", GTK_RESPONSE_CLOSE);
2533+
window->priv->pd_cancel_button = gtk_dialog_add_button (GTK_DIALOG (window->priv->progress_dialog), "gtk-cancel", GTK_RESPONSE_CANCEL);
25342534

25352535
d = GTK_DIALOG (window->priv->progress_dialog);
25362536
gtk_window_set_resizable (GTK_WINDOW (d), TRUE);
@@ -4135,12 +4135,12 @@ fr_window_drag_data_received (GtkWidget *widget,
41354135

41364136
d = _gtk_message_dialog_new (GTK_WINDOW (window),
41374137
GTK_DIALOG_MODAL,
4138-
GTK_STOCK_DIALOG_QUESTION,
4138+
"dialog-question",
41394139
_("Do you want to add this file to the current archive or open it as a new archive?"),
41404140
NULL,
4141-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
4142-
GTK_STOCK_ADD, 0,
4143-
GTK_STOCK_OPEN, 1,
4141+
"gtk-cancel", GTK_RESPONSE_CANCEL,
4142+
"gtk-add", 0,
4143+
"gtk-open", 1,
41444144
NULL);
41454145

41464146
gtk_dialog_set_default_response (GTK_DIALOG (d), 2);
@@ -4165,10 +4165,10 @@ fr_window_drag_data_received (GtkWidget *widget,
41654165

41664166
d = _gtk_message_dialog_new (GTK_WINDOW (window),
41674167
GTK_DIALOG_MODAL,
4168-
GTK_STOCK_DIALOG_QUESTION,
4168+
"dialog-question",
41694169
_("Do you want to create a new archive with these files?"),
41704170
NULL,
4171-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
4171+
"gtk-cancel", GTK_RESPONSE_CANCEL,
41724172
_("Create _Archive"), GTK_RESPONSE_YES,
41734173
NULL);
41744174

@@ -5871,7 +5871,7 @@ fr_window_construct (FrWindow *window)
58715871
/* Translators: this is the label for the "open recent file" sub-menu. */
58725872
"label", _("Open _Recent"),
58735873
"tooltip", _("Open a recently used archive"),
5874-
"stock-id", GTK_STOCK_OPEN,
5874+
"stock-id", "gtk-open",
58755875
NULL);
58765876
fr_window_init_recent_chooser (window, GTK_RECENT_CHOOSER (action));
58775877
gtk_action_group_add_action (actions, action);
@@ -5883,7 +5883,7 @@ fr_window_construct (FrWindow *window)
58835883
"name", "OpenRecent_Toolbar",
58845884
"label", _("Open"),
58855885
"tooltip", _("Open a recently used archive"),
5886-
"stock-id", GTK_STOCK_OPEN,
5886+
"stock-id", "gtk-open",
58875887
"is-important", TRUE,
58885888
NULL);
58895889
fr_window_init_recent_chooser (window, GTK_RECENT_CHOOSER (action));
@@ -6813,10 +6813,10 @@ _fr_window_ask_overwrite_dialog (OverwriteData *odata)
68136813
details = g_strdup_printf (_("Another file with the same name already exists in \"%s\"."), parent_name);
68146814
d = _gtk_message_dialog_new (GTK_WINDOW (odata->window),
68156815
GTK_DIALOG_MODAL,
6816-
GTK_STOCK_DIALOG_QUESTION,
6816+
"dialog-question",
68176817
msg,
68186818
details,
6819-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
6819+
"gtk-cancel", GTK_RESPONSE_CANCEL,
68206820
_("Replace _All"), _FR_RESPONSE_OVERWRITE_YES_ALL,
68216821
_("_Skip"), _FR_RESPONSE_OVERWRITE_NO,
68226822
_("_Replace"), _FR_RESPONSE_OVERWRITE_YES,
@@ -6858,10 +6858,10 @@ _fr_window_ask_overwrite_dialog (OverwriteData *odata)
68586858

68596859
d = _gtk_message_dialog_new (GTK_WINDOW (odata->window),
68606860
0,
6861-
GTK_STOCK_DIALOG_WARNING,
6861+
"dialog-warning",
68626862
_("Extraction not performed"),
68636863
NULL,
6864-
GTK_STOCK_OK, GTK_RESPONSE_OK,
6864+
"gtk-ok", GTK_RESPONSE_OK,
68656865
NULL);
68666866
gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK);
68676867
fr_window_show_error_dialog (odata->window, d, GTK_WINDOW (odata->window), _("Extraction not performed"));
@@ -6923,10 +6923,10 @@ fr_window_archive_extract (FrWindow *window,
69236923

69246924
d = _gtk_message_dialog_new (GTK_WINDOW (window),
69256925
GTK_DIALOG_MODAL,
6926-
GTK_STOCK_DIALOG_QUESTION,
6926+
"dialog-question",
69276927
msg,
69286928
NULL,
6929-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
6929+
"gtk-cancel", GTK_RESPONSE_CANCEL,
69306930
_("Create _Folder"), GTK_RESPONSE_YES,
69316931
NULL);
69326932

@@ -6966,10 +6966,10 @@ fr_window_archive_extract (FrWindow *window,
69666966

69676967
d = _gtk_message_dialog_new (GTK_WINDOW (window),
69686968
0,
6969-
GTK_STOCK_DIALOG_WARNING,
6969+
"dialog-warning",
69706970
_("Extraction not performed"),
69716971
NULL,
6972-
GTK_STOCK_OK, GTK_RESPONSE_OK,
6972+
"gtk-ok", GTK_RESPONSE_OK,
69736973
NULL);
69746974
gtk_dialog_set_default_response (GTK_DIALOG (d), GTK_RESPONSE_OK);
69756975
fr_window_show_error_dialog (window, d, GTK_WINDOW (window), _("Extraction not performed"));
@@ -7354,7 +7354,7 @@ fr_window_view_last_output (FrWindow *window,
73547354
dialog = gtk_dialog_new_with_buttons (title,
73557355
GTK_WINDOW (window),
73567356
GTK_DIALOG_DESTROY_WITH_PARENT,
7357-
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
7357+
"gtk-close", GTK_RESPONSE_CLOSE,
73587358
NULL);
73597359
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CLOSE);
73607360
gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
@@ -7776,7 +7776,7 @@ fr_window_rename_selection (FrWindow *window,
77767776
(renaming_dir ? _("_New folder name:") : _("_New file name:")),
77777777
utf8_old_name,
77787778
1024,
7779-
GTK_STOCK_CANCEL,
7779+
"gtk-cancel",
77807780
_("_Rename"));
77817781
g_free (utf8_old_name);
77827782

@@ -7812,10 +7812,10 @@ fr_window_rename_selection (FrWindow *window,
78127812

78137813
dlg = _gtk_message_dialog_new (GTK_WINDOW (window),
78147814
GTK_DIALOG_MODAL,
7815-
GTK_STOCK_DIALOG_QUESTION,
7815+
"dialog-question",
78167816
(renaming_dir ? _("Could not rename the folder") : _("Could not rename the file")),
78177817
reason,
7818-
GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
7818+
"gtk-close", GTK_RESPONSE_OK,
78197819
NULL);
78207820
gtk_dialog_run (GTK_DIALOG (dlg));
78217821
gtk_widget_destroy (dlg);
@@ -8217,8 +8217,8 @@ fr_window_paste_selection (FrWindow *window,
82178217
_("_Destination folder:"),
82188218
utf8_old_path,
82198219
1024,
8220-
GTK_STOCK_CANCEL,
8221-
GTK_STOCK_PASTE);
8220+
"gtk-cancel",
8221+
"gtk-paste");
82228222
g_free (utf8_old_path);
82238223
if (utf8_path == NULL)
82248224
return;

‎src/gtk-utils.c

+13-13
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ _gtk_count_selected (GtkTreeSelection *selection)
5454
GtkWidget*
5555
_gtk_message_dialog_new (GtkWindow *parent,
5656
GtkDialogFlags flags,
57-
const char *stock_id,
57+
const char *icon_name,
5858
const char *message,
5959
const char *secondary_message,
6060
const gchar *first_button_text,
@@ -72,15 +72,15 @@ _gtk_message_dialog_new (GtkWindow *parent,
7272

7373
g_return_val_if_fail ((message != NULL) || (secondary_message != NULL), NULL);
7474

75-
if (stock_id == NULL)
76-
stock_id = GTK_STOCK_DIALOG_INFO;
75+
if (icon_name == NULL)
76+
icon_name = "dialog-information";
7777

7878
dialog = gtk_dialog_new_with_buttons ("", parent, flags, NULL, NULL);
7979
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
8080

8181
/* Add label and image */
8282

83-
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_DIALOG);
83+
image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_DIALOG);
8484
gtk_widget_set_valign (image, GTK_ALIGN_START);
8585

8686
label = gtk_label_new ("");
@@ -244,12 +244,12 @@ _gtk_request_dialog_run (GtkWindow *parent,
244244

245245
/* Add buttons */
246246

247-
button = create_button (GTK_STOCK_CANCEL, no_button_text);
247+
button = create_button ("gtk-cancel", no_button_text);
248248
gtk_dialog_add_action_widget (GTK_DIALOG (dialog),
249249
button,
250250
GTK_RESPONSE_CANCEL);
251251

252-
button = create_button (GTK_STOCK_OK, yes_button_text);
252+
button = create_button ("gtk-ok", yes_button_text);
253253
gtk_dialog_add_action_widget (GTK_DIALOG (dialog),
254254
button,
255255
GTK_RESPONSE_YES);
@@ -316,14 +316,14 @@ _gtk_yesno_dialog_new (GtkWindow *parent,
316316

317317
/* Add buttons */
318318

319-
button = create_button (GTK_STOCK_CANCEL, no_button_text);
319+
button = create_button ("gtk-cancel", no_button_text);
320320
gtk_dialog_add_action_widget (GTK_DIALOG (d),
321321
button,
322322
GTK_RESPONSE_CANCEL);
323323

324324
/**/
325325

326-
button = create_button (GTK_STOCK_OK, yes_button_text);
326+
button = create_button ("gtk-ok", yes_button_text);
327327
gtk_dialog_add_action_widget (GTK_DIALOG (d),
328328
button,
329329
GTK_RESPONSE_YES);
@@ -364,7 +364,7 @@ _gtk_error_dialog_new (GtkWindow *parent,
364364
dialog = gtk_dialog_new_with_buttons ("",
365365
parent,
366366
flags,
367-
GTK_STOCK_OK, GTK_RESPONSE_OK,
367+
"gtk-ok", GTK_RESPONSE_OK,
368368
NULL);
369369
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
370370
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
@@ -494,10 +494,10 @@ _gtk_error_dialog_run (GtkWindow *parent,
494494

495495
d = _gtk_message_dialog_new (parent,
496496
GTK_DIALOG_MODAL,
497-
GTK_STOCK_DIALOG_ERROR,
497+
"dialog-error",
498498
main_message,
499499
message,
500-
GTK_STOCK_CLOSE, GTK_RESPONSE_CANCEL,
500+
"gtk-close", GTK_RESPONSE_CANCEL,
501501
NULL);
502502
g_free (message);
503503

@@ -736,10 +736,10 @@ show_help_dialog (GtkWindow *parent,
736736

737737
dialog = _gtk_message_dialog_new (parent,
738738
GTK_DIALOG_DESTROY_WITH_PARENT,
739-
GTK_STOCK_DIALOG_ERROR,
739+
"dialog-error",
740740
_("Could not display help"),
741741
error->message,
742-
GTK_STOCK_OK, GTK_RESPONSE_OK,
742+
"gtk-ok", GTK_RESPONSE_OK,
743743
NULL);
744744
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
745745

‎src/gtk-utils.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
int _gtk_count_selected (GtkTreeSelection *selection);
3131
GtkWidget* _gtk_message_dialog_new (GtkWindow *parent,
3232
GtkDialogFlags flags,
33-
const char *stock_id,
33+
const char *icon_name,
3434
const char *message,
3535
const char *secondary_message,
3636
const char *first_button_text,

0 commit comments

Comments
 (0)