From ff6a32e8002be01e253a61a4abb9b61961252ddd Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Fri, 22 Jan 2016 01:59:31 +0100 Subject: Gtk3: fix all possible deprecated GtkStock in src --- src/caja-connect-server-dialog.c | 12 ++++++------ src/caja-location-entry.c | 8 ++++---- src/caja-notebook.c | 2 +- src/caja-query-editor.c | 4 ++-- src/caja-search-bar.c | 4 ++-- src/caja-side-pane.c | 2 +- src/caja-zoom-control.c | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/caja-connect-server-dialog.c b/src/caja-connect-server-dialog.c index f2c7782c..312bcf4a 100644 --- a/src/caja-connect-server-dialog.c +++ b/src/caja-connect-server-dialog.c @@ -222,7 +222,7 @@ connect_dialog_gvfs_error (CajaConnectServerDialog *dialog) gtk_container_add (GTK_CONTAINER (content_area), hbox); gtk_widget_show (hbox); - image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_SMALL_TOOLBAR); + image = gtk_image_new_from_icon_name ("dialog-error", GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 6); gtk_widget_show (image); @@ -251,7 +251,7 @@ iconized_entry_restore (gpointer data, entry = data; dialog = user_data; - gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), + gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, NULL); @@ -278,9 +278,9 @@ iconize_entry (CajaConnectServerDialog *dialog, dialog->details->iconized_entries = g_list_prepend (dialog->details->iconized_entries, entry); - gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), + gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, - GTK_STOCK_DIALOG_WARNING); + "dialog-warning"); gtk_widget_grab_focus (entry); @@ -338,7 +338,7 @@ connect_dialog_set_info_bar_error (CajaConnectServerDialog *dialog, gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 6); gtk_widget_show (hbox); - icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, + icon = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 6); gtk_widget_show (icon); @@ -414,7 +414,7 @@ connect_dialog_request_additional_details (CajaConnectServerDialog *self, gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 6); gtk_widget_show (hbox); - icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, + icon = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 6); gtk_widget_show (icon); diff --git a/src/caja-location-entry.c b/src/caja-location-entry.c index 0a59a347..3b08a1c8 100644 --- a/src/caja-location-entry.c +++ b/src/caja-location-entry.c @@ -425,14 +425,14 @@ caja_location_entry_set_secondary_action (CajaLocationEntry *entry, switch (secondary_action) { case CAJA_LOCATION_ENTRY_ACTION_CLEAR: - gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), + gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, - GTK_STOCK_CLEAR); + "gtk-clear"); break; case CAJA_LOCATION_ENTRY_ACTION_GOTO: - gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), + gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, - GTK_STOCK_GO_FORWARD); + "forward"); break; default: g_assert_not_reached (); diff --git a/src/caja-notebook.c b/src/caja-notebook.c index ccfa751f..69a50ade 100644 --- a/src/caja-notebook.c +++ b/src/caja-notebook.c @@ -425,7 +425,7 @@ build_tab_label (CajaNotebook *nb, CajaWindowSlot *slot) gtk_widget_set_name (close_button, "caja-tab-close-button"); - image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_MENU); gtk_widget_set_tooltip_text (close_button, _("Close tab")); g_signal_connect_object (close_button, "clicked", G_CALLBACK (close_button_clicked_cb), slot, 0); diff --git a/src/caja-query-editor.c b/src/caja-query-editor.c index 205f18ee..38ef74bf 100644 --- a/src/caja-query-editor.c +++ b/src/caja-query-editor.c @@ -991,7 +991,7 @@ caja_query_editor_add_row (CajaQueryEditor *editor, create_type_widgets (row); button = gtk_button_new (); - image = gtk_image_new_from_stock (GTK_STOCK_REMOVE, + image = gtk_image_new_from_icon_name ("remove", GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_container_add (GTK_CONTAINER (button), image); gtk_widget_show (image); @@ -1085,7 +1085,7 @@ finish_first_line (CajaQueryEditor *editor, GtkWidget *hbox, gboolean use_go) GtkWidget *button, *image; button = gtk_button_new (); - image = gtk_image_new_from_stock (GTK_STOCK_ADD, + image = gtk_image_new_from_icon_name ("add", GTK_ICON_SIZE_SMALL_TOOLBAR); gtk_container_add (GTK_CONTAINER (button), image); gtk_widget_show (image); diff --git a/src/caja-search-bar.c b/src/caja-search-bar.c index 705f259e..d09ffc3b 100644 --- a/src/caja-search-bar.c +++ b/src/caja-search-bar.c @@ -179,9 +179,9 @@ caja_search_bar_init (CajaSearchBar *bar) gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); bar->details->entry = gtk_entry_new (); - gtk_entry_set_icon_from_stock (GTK_ENTRY (bar->details->entry), + gtk_entry_set_icon_from_icon_name (GTK_ENTRY (bar->details->entry), GTK_ENTRY_ICON_SECONDARY, - GTK_STOCK_FIND); + "find"); gtk_box_pack_start (GTK_BOX (hbox), bar->details->entry, TRUE, TRUE, 0); g_signal_connect (bar->details->entry, "activate", diff --git a/src/caja-side-pane.c b/src/caja-side-pane.c index ae84242e..7be604cf 100644 --- a/src/caja-side-pane.c +++ b/src/caja-side-pane.c @@ -373,7 +373,7 @@ caja_side_pane_init (GObject *object) gtk_widget_show (close_button); - image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, + image = gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_MENU); gtk_widget_show (image); diff --git a/src/caja-zoom-control.c b/src/caja-zoom-control.c index fb8ba0da..45424303 100644 --- a/src/caja-zoom-control.c +++ b/src/caja-zoom-control.c @@ -316,7 +316,7 @@ caja_zoom_control_init (CajaZoomControl *zoom_control) GINT_TO_POINTER (i)); } - image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name ("zoom-out", GTK_ICON_SIZE_MENU); zoom_control->details->zoom_out = gtk_button_new (); gtk_button_set_focus_on_click (GTK_BUTTON (zoom_control->details->zoom_out), FALSE); gtk_button_set_relief (GTK_BUTTON (zoom_control->details->zoom_out), @@ -370,7 +370,7 @@ caja_zoom_control_init (CajaZoomControl *zoom_control) gtk_box_pack_start (GTK_BOX (zoom_control), zoom_control->details->zoom_button, TRUE, TRUE, 0); - image = gtk_image_new_from_stock (GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name ("zoom-in", GTK_ICON_SIZE_MENU); zoom_control->details->zoom_in = gtk_button_new (); gtk_button_set_focus_on_click (GTK_BUTTON (zoom_control->details->zoom_in), FALSE); gtk_button_set_relief (GTK_BUTTON (zoom_control->details->zoom_in), -- cgit v1.2.1