From 21686dc36dccc260e7aed4c4935c71989c970710 Mon Sep 17 00:00:00 2001 From: monsta Date: Thu, 14 Jan 2016 15:36:34 +0300 Subject: appearance: use gtk_image_new_from_icon_name in both GTK+ builds --- capplets/appearance/appearance-desktop.c | 8 ++++---- capplets/appearance/appearance-style.c | 6 +++--- capplets/appearance/appearance-themes.c | 8 ++++---- capplets/appearance/theme-save.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c index 2b9c873f..18c9e72f 100644 --- a/capplets/appearance/appearance-desktop.c +++ b/capplets/appearance/appearance-desktop.c @@ -851,9 +851,9 @@ wp_update_preview (GtkFileChooser *chooser, } else { - gtk_image_set_from_stock (GTK_IMAGE (data->wp_image), - "gtk-dialog-question", - GTK_ICON_SIZE_DIALOG); + gtk_image_set_from_icon_name (GTK_IMAGE (data->wp_image), + "dialog-question", + GTK_ICON_SIZE_DIALOG); } } @@ -1332,7 +1332,7 @@ desktop_init (AppearanceData *data, add_button = appearance_capplet_get_widget (data, "wp_add_button"); gtk_button_set_image (GTK_BUTTON (add_button), - gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_BUTTON)); + gtk_image_new_from_icon_name ("list-add", GTK_ICON_SIZE_BUTTON)); g_signal_connect (add_button, "clicked", (GCallback) wp_file_open_dialog, data); diff --git a/capplets/appearance/appearance-style.c b/capplets/appearance/appearance-style.c index 785ee689..9c4cedc8 100644 --- a/capplets/appearance/appearance-style.c +++ b/capplets/appearance/appearance-style.c @@ -237,7 +237,7 @@ static void update_message_area(AppearanceData* data) gtk_misc_set_alignment (GTK_MISC (data->style_message_label), 0.0, 0.5); hbox = gtk_hbox_new (FALSE, 9); - icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG); + icon = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG); gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0); gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hbox), data->style_message_label, TRUE, TRUE, 0); @@ -1046,8 +1046,8 @@ style_init (AppearanceData *data) w = appearance_capplet_get_widget (data, "color_scheme_defaults_button"); gtk_button_set_image (GTK_BUTTON (w), - gtk_image_new_from_stock (GTK_STOCK_REVERT_TO_SAVED, - GTK_ICON_SIZE_BUTTON)); + gtk_image_new_from_icon_name ("document-revert", + GTK_ICON_SIZE_BUTTON)); settings = gtk_settings_get_default (); g_signal_connect (settings, "notify::gtk-color-scheme", (GCallback) color_scheme_changed, data); diff --git a/capplets/appearance/appearance-themes.c b/capplets/appearance/appearance-themes.c index 807d6143..61f97dd9 100644 --- a/capplets/appearance/appearance-themes.c +++ b/capplets/appearance/appearance-themes.c @@ -668,8 +668,8 @@ theme_message_area_update (AppearanceData *data) hbox = gtk_hbox_new (FALSE, 9); gtk_widget_show (hbox); - data->theme_info_icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG); - data->theme_error_icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG); + data->theme_info_icon = gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_DIALOG); + data->theme_error_icon = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_DIALOG); gtk_misc_set_alignment (GTK_MISC (data->theme_info_icon), 0.5, 0); gtk_misc_set_alignment (GTK_MISC (data->theme_error_icon), 0.5, 0); gtk_box_pack_start (GTK_BOX (hbox), data->theme_info_icon, FALSE, FALSE, 0); @@ -1075,12 +1075,12 @@ void themes_init(AppearanceData* data) w = appearance_capplet_get_widget (data, "theme_install"); gtk_button_set_image (GTK_BUTTON (w), - gtk_image_new_from_stock (GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON)); + gtk_image_new_from_icon_name ("document-open", GTK_ICON_SIZE_BUTTON)); g_signal_connect (w, "clicked", (GCallback) theme_install_cb, data); w = appearance_capplet_get_widget (data, "theme_save"); gtk_button_set_image (GTK_BUTTON (w), - gtk_image_new_from_stock (GTK_STOCK_SAVE_AS, GTK_ICON_SIZE_BUTTON)); + gtk_image_new_from_icon_name ("document-save-as", GTK_ICON_SIZE_BUTTON)); g_signal_connect (w, "clicked", (GCallback) theme_save_cb, data); w = appearance_capplet_get_widget (data, "theme_custom"); diff --git a/capplets/appearance/theme-save.c b/capplets/appearance/theme-save.c index 81265b79..20904496 100644 --- a/capplets/appearance/theme-save.c +++ b/capplets/appearance/theme-save.c @@ -157,7 +157,7 @@ setup_directory_structure (const gchar *theme_name, _("The theme already exists. Would you like to replace it?")); button = gtk_dialog_add_button (dialog, _("_Overwrite"), GTK_RESPONSE_ACCEPT); gtk_button_set_image (GTK_BUTTON (button), - gtk_image_new_from_stock (GTK_STOCK_SAVE, GTK_ICON_SIZE_BUTTON)); + gtk_image_new_from_icon_name ("document-save", GTK_ICON_SIZE_BUTTON)); response = gtk_dialog_run (dialog); gtk_widget_destroy (GTK_WIDGET (dialog)); retval = (response != GTK_RESPONSE_CANCEL); -- cgit v1.2.1