diff options
| author | Ernestas Kulik <ernestask@gnome.org> | 2018-07-10 12:16:45 +0300 |
|---|---|---|
| committer | Ernestas Kulik <ekulik@redhat.com> | 2019-06-29 14:33:40 +0200 |
| commit | ea575141c9e4caf675c8f66ee1873b3c9ae6d1c2 (patch) | |
| tree | c6f6a07efcc70c957a821376c4f6190feec89e69 | |
| parent | def08928d939e519d25ebda6bc031379e39313b9 (diff) | |
| download | nautilus-ea575141c9e4caf675c8f66ee1873b3c9ae6d1c2.tar.gz | |
general: Don’t pass size when creating GtkImage
GtkImage no longer takes the icon size parameter for creation.
| -rw-r--r-- | src/nautilus-file-conflict-dialog.c | 4 | ||||
| -rw-r--r-- | src/nautilus-pathbar.c | 8 | ||||
| -rw-r--r-- | src/nautilus-x-content-bar.c | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/nautilus-file-conflict-dialog.c b/src/nautilus-file-conflict-dialog.c index c34a92ce0..fe0230210 100644 --- a/src/nautilus-file-conflict-dialog.c +++ b/src/nautilus-file-conflict-dialog.c @@ -259,9 +259,9 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd) g_object_set (hbox, "margin", 6, NULL); /* Setup the dialog image */ - widget = gtk_image_new_from_icon_name ("dialog-warning", - GTK_ICON_SIZE_DIALOG); + widget = gtk_image_new_from_icon_name ("dialog-warning"); gtk_box_pack_start (GTK_BOX (hbox), widget); + gtk_image_set_pixel_size (GTK_IMAGE (widget), 48); gtk_widget_set_valign (widget, GTK_ALIGN_START); /* Setup the vbox containing the dialog body */ diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c index 1e5e5e744..12d9c2aa5 100644 --- a/src/nautilus-pathbar.c +++ b/src/nautilus-pathbar.c @@ -1298,7 +1298,7 @@ nautilus_path_bar_update_button_appearance (ButtonData *button_data, icon = get_gicon (button_data); if (icon != NULL) { - gtk_image_set_from_gicon (GTK_IMAGE (button_data->image), icon, GTK_ICON_SIZE_MENU); + gtk_image_set_from_gicon (GTK_IMAGE (button_data->image), icon); gtk_style_context_add_class (gtk_widget_get_style_context (button_data->button), "image-button"); gtk_widget_show (GTK_WIDGET (button_data->image)); @@ -1555,8 +1555,7 @@ make_button_data (NautilusPathBar *self, case OTHER_LOCATIONS_BUTTON: { button_data->label = gtk_label_new (NULL); - button_data->disclosure_arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", - GTK_ICON_SIZE_MENU); + button_data->disclosure_arrow = gtk_image_new_from_icon_name ("pan-down-symbolic"); gtk_widget_set_margin_start (button_data->disclosure_arrow, 0); button_data->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_container_add (GTK_CONTAINER (button_data->button), button_data->container); @@ -1572,8 +1571,7 @@ make_button_data (NautilusPathBar *self, default: { button_data->label = gtk_label_new (NULL); - button_data->disclosure_arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", - GTK_ICON_SIZE_MENU); + button_data->disclosure_arrow = gtk_image_new_from_icon_name ("pan-down-symbolic"); gtk_widget_set_margin_start (button_data->disclosure_arrow, 0); button_data->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_container_add (GTK_CONTAINER (button_data->button), button_data->container); diff --git a/src/nautilus-x-content-bar.c b/src/nautilus-x-content-bar.c index f37c84668..ff6e10c64 100644 --- a/src/nautilus-x-content-bar.c +++ b/src/nautilus-x-content-bar.c @@ -179,7 +179,7 @@ nautilus_x_content_bar_set_x_content_types (NautilusXContentBar *bar, icon = g_app_info_get_icon (default_app); if (icon != NULL) { - image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_gicon (icon); } else { |