Skip to content

Commit 17b2017

Browse files
sc0wraveit65
sc0w
authored and
raveit65
committed
avoid deprecated GtkStock
1 parent 9e312c4 commit 17b2017

File tree

13 files changed

+46
-34
lines changed

13 files changed

+46
-34
lines changed

‎capplets/about-me/mate-about-me-fingerprint.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ delete_fingerprints_question (GtkBuilder *dialog, GtkWidget *enable, GtkWidget *
219219
GTK_MESSAGE_QUESTION,
220220
GTK_BUTTONS_NONE,
221221
_("Delete registered fingerprints?"));
222-
gtk_dialog_add_button (GTK_DIALOG (question), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
222+
gtk_dialog_add_button (GTK_DIALOG (question), "gtk-cancel", GTK_RESPONSE_CANCEL);
223223

224224
button = gtk_button_new_with_mnemonic (_("_Delete Fingerprints"));
225225
gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name ("edit-delete", GTK_ICON_SIZE_BUTTON));

‎capplets/about-me/mate-about-me.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,8 @@ about_me_image_clicked_cb (GtkWidget *button, MateAboutMe *me)
268268
gtk_file_chooser_dialog_new (_("Select Image"), GTK_WINDOW (WID ("about-me-dialog")),
269269
GTK_FILE_CHOOSER_ACTION_OPEN,
270270
_("No Image"), GTK_RESPONSE_NO,
271-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
272-
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
271+
"gtk-cancel", GTK_RESPONSE_CANCEL,
272+
"gtk-open", GTK_RESPONSE_ACCEPT,
273273
NULL));
274274
gtk_window_set_modal (GTK_WINDOW (chooser_dialog), TRUE);
275275
gtk_dialog_set_default_response (GTK_DIALOG (chooser_dialog), GTK_RESPONSE_ACCEPT);

‎capplets/appearance/appearance-desktop.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,9 +615,9 @@ wp_create_filechooser (AppearanceData *data)
615615
gtk_file_chooser_dialog_new (_("Add Wallpaper"),
616616
GTK_WINDOW (appearance_capplet_get_widget (data, "appearance_window")),
617617
GTK_FILE_CHOOSER_ACTION_OPEN,
618-
GTK_STOCK_CANCEL,
618+
"gtk-cancel",
619619
GTK_RESPONSE_CANCEL,
620-
GTK_STOCK_OPEN,
620+
"gtk-open",
621621
GTK_RESPONSE_OK,
622622
NULL));
623623

‎capplets/appearance/appearance-themes.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1085,7 +1085,7 @@ void themes_init(AppearanceData* data)
10851085

10861086
w = appearance_capplet_get_widget (data, "theme_custom");
10871087
gtk_button_set_image (GTK_BUTTON (w),
1088-
gtk_image_new_from_stock (GTK_STOCK_EDIT, GTK_ICON_SIZE_BUTTON));
1088+
gtk_image_new_from_icon_name ("gtk-edit", GTK_ICON_SIZE_BUTTON));
10891089
g_signal_connect (w, "clicked", (GCallback) theme_custom_cb, data);
10901090

10911091
del_button = appearance_capplet_get_widget (data, "theme_delete");

‎capplets/appearance/theme-installer.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,8 @@ mate_theme_install_real (GtkWindow *parent,
481481

482482
apply_button = gtk_button_new_with_label (_("Apply New Theme"));
483483
gtk_button_set_image (GTK_BUTTON (apply_button),
484-
gtk_image_new_from_stock (GTK_STOCK_APPLY,
485-
GTK_ICON_SIZE_BUTTON));
484+
gtk_image_new_from_icon_name ("gtk-apply",
485+
GTK_ICON_SIZE_BUTTON));
486486
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), apply_button, GTK_RESPONSE_APPLY);
487487
gtk_widget_set_can_default (apply_button, TRUE);
488488
gtk_widget_show (apply_button);
@@ -815,9 +815,9 @@ mate_theme_installer_run (GtkWindow *parent,
815815
dialog = gtk_file_chooser_dialog_new (_("Select Theme"),
816816
parent,
817817
GTK_FILE_CHOOSER_ACTION_OPEN,
818-
GTK_STOCK_CANCEL,
818+
"gtk-cancel",
819819
GTK_RESPONSE_REJECT,
820-
GTK_STOCK_OPEN,
820+
"gtk-open",
821821
GTK_RESPONSE_ACCEPT,
822822
NULL);
823823
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);

‎capplets/appearance/theme-util.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ gboolean theme_delete (const gchar *name, ThemeType type)
7171
GTK_MESSAGE_QUESTION,
7272
GTK_BUTTONS_CANCEL,
7373
_("Would you like to delete this theme?"));
74-
gtk_dialog_add_button (dialog, GTK_STOCK_DELETE, GTK_RESPONSE_ACCEPT);
74+
gtk_dialog_add_button (dialog, "gtk-delete", GTK_RESPONSE_ACCEPT);
7575
response = gtk_dialog_run (dialog);
7676
gtk_widget_destroy (GTK_WIDGET (dialog));
7777
if (response != GTK_RESPONSE_ACCEPT)

‎capplets/common/capplet-stock-icons.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ capplet_register_stock_icons (GtkIconFactory *factory)
6464

6565
if (!filename) {
6666
g_warning (_("Unable to load stock icon '%s'\n"), items[i].name);
67-
icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_MISSING_IMAGE);
67+
icon_set = gtk_icon_factory_lookup_default ("gtk-missing-image");
6868
gtk_icon_factory_add (factory, items[i].stock_id, icon_set);
6969
continue;
7070
}

‎capplets/common/file-transfer-dialog.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ file_transfer_dialog_init (FileTransferDialog *dlg)
329329
dlg->priv->progress, FALSE, FALSE, 0);
330330

331331
gtk_dialog_add_button (GTK_DIALOG (dlg),
332-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
332+
"gtk-cancel", GTK_RESPONSE_CANCEL);
333333

334334
gtk_container_set_border_width (GTK_CONTAINER (dlg), 6);
335335

@@ -441,8 +441,8 @@ file_transfer_dialog_overwrite (gpointer user_data)
441441

442442
button = gtk_button_new_with_label (_("_Overwrite"));
443443
gtk_button_set_image (GTK_BUTTON (button),
444-
gtk_image_new_from_stock (GTK_STOCK_APPLY,
445-
GTK_ICON_SIZE_BUTTON));
444+
gtk_image_new_from_icon_name ("gtk-apply",
445+
GTK_ICON_SIZE_BUTTON));
446446
gtk_dialog_add_action_widget (dialog, button, GTK_RESPONSE_YES);
447447
gtk_widget_show (button);
448448

‎capplets/common/theme-thumbnail.c‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ create_meta_theme_pixbuf (ThemeThumbnailData *theme_thumbnail_data)
172172
GtkWidget *preview;
173173
GtkWidget *vbox;
174174
GtkWidget *box;
175-
GtkWidget *stock_button;
175+
GtkWidget *image_button;
176176
GtkWidget *checkbox;
177177
GtkWidget *radio;
178178

@@ -220,11 +220,17 @@ create_meta_theme_pixbuf (ThemeThumbnailData *theme_thumbnail_data)
220220
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
221221
gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
222222
gtk_container_add (GTK_CONTAINER (preview), vbox);
223-
stock_button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
224-
gtk_widget_set_halign (stock_button, GTK_ALIGN_START);
225-
gtk_widget_set_valign (stock_button, GTK_ALIGN_START);
226-
gtk_widget_show (stock_button);
227-
gtk_box_pack_start (GTK_BOX (vbox), stock_button, FALSE, FALSE, 0);
223+
224+
image_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
225+
"label", "gtk-open",
226+
"use-stock", TRUE,
227+
"use-underline", TRUE,
228+
NULL));
229+
230+
gtk_widget_set_halign (image_button, GTK_ALIGN_START);
231+
gtk_widget_set_valign (image_button, GTK_ALIGN_START);
232+
gtk_widget_show (image_button);
233+
gtk_box_pack_start (GTK_BOX (vbox), image_button, FALSE, FALSE, 0);
228234
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
229235
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, FALSE, 0);
230236
checkbox = gtk_check_button_new ();
@@ -281,7 +287,7 @@ static GdkPixbuf *
281287
create_gtk_theme_pixbuf (ThemeThumbnailData *theme_thumbnail_data)
282288
{
283289
GtkSettings *settings;
284-
GtkWidget *window, *vbox, *box, *stock_button, *checkbox, *radio;
290+
GtkWidget *window, *vbox, *box, *image_button, *checkbox, *radio;
285291
GtkRequisition requisition;
286292
GtkAllocation allocation;
287293
GdkPixbuf *pixbuf, *retval;
@@ -299,8 +305,14 @@ create_gtk_theme_pixbuf (ThemeThumbnailData *theme_thumbnail_data)
299305
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
300306
gtk_container_set_border_width (GTK_CONTAINER (box), 6);
301307
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, FALSE, 0);
302-
stock_button = gtk_button_new_from_stock (GTK_STOCK_OPEN);
303-
gtk_box_pack_start (GTK_BOX (box), stock_button, FALSE, FALSE, 0);
308+
309+
image_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
310+
"label", "gtk-open",
311+
"use-stock", TRUE,
312+
"use-underline", TRUE,
313+
NULL));
314+
315+
gtk_box_pack_start (GTK_BOX (box), image_button, FALSE, FALSE, 0);
304316
checkbox = gtk_check_button_new ();
305317
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE);
306318
gtk_box_pack_start (GTK_BOX (box), checkbox, FALSE, FALSE, 0);
@@ -309,12 +321,12 @@ create_gtk_theme_pixbuf (ThemeThumbnailData *theme_thumbnail_data)
309321

310322
gtk_widget_show_all (window);
311323
gtk_widget_show_all (vbox);
312-
gtk_widget_realize (stock_button);
313-
gtk_widget_realize (gtk_bin_get_child (GTK_BIN (stock_button)));
324+
gtk_widget_realize (image_button);
325+
gtk_widget_realize (gtk_bin_get_child (GTK_BIN (image_button)));
314326
gtk_widget_realize (checkbox);
315327
gtk_widget_realize (radio);
316-
gtk_widget_map (stock_button);
317-
gtk_widget_map (gtk_bin_get_child (GTK_BIN (stock_button)));
328+
gtk_widget_map (image_button);
329+
gtk_widget_map (gtk_bin_get_child (GTK_BIN (image_button)));
318330
gtk_widget_map (checkbox);
319331
gtk_widget_map (radio);
320332

‎capplets/windows/mate-metacity-support.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ mate_metacity_config_tool ()
4040
dialog = GTK_DIALOG (gtk_dialog_new_with_buttons(_("Metacity Preferences"),
4141
NULL,
4242
GTK_DIALOG_MODAL,
43-
GTK_STOCK_CLOSE,
43+
"gtk-close",
4444
GTK_RESPONSE_CLOSE,
4545
NULL));
4646
gtk_window_set_icon_name (GTK_WINDOW (dialog), "preferences-system-windows");

0 commit comments

Comments
 (0)