diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-08-07 08:38:02 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-08-07 08:38:02 +0200 |
| commit | b1998c6ab583d5129ef0e10eb9b6c99ff0b89631 (patch) | |
| tree | 89f3201214321fbc0384562f70164f2f057d0711 /src/idobasicmenuitem.c | |
| parent | 09c5052d290d76faadc997a6aefe49a398959463 (diff) | |
| parent | e487b162ba82a1a454657a8ab5dbd6d04a17b591 (diff) | |
| download | ayatana-ido-b1998c6ab583d5129ef0e10eb9b6c99ff0b89631.tar.gz ayatana-ido-b1998c6ab583d5129ef0e10eb9b6c99ff0b89631.tar.bz2 ayatana-ido-b1998c6ab583d5129ef0e10eb9b6c99ff0b89631.zip | |
Merge branch 'tari01-pr/no-hardcoded-icon-sizes'
Attributes GH PR #66: https://github.com/AyatanaIndicators/ayatana-ido/pull/66
Diffstat (limited to 'src/idobasicmenuitem.c')
| -rw-r--r-- | src/idobasicmenuitem.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/src/idobasicmenuitem.c b/src/idobasicmenuitem.c index 5077546..5106144 100644 --- a/src/idobasicmenuitem.c +++ b/src/idobasicmenuitem.c @@ -1,6 +1,6 @@ /* * Copyright 2013 Canonical Ltd. - * Copyright 2021-2022 Robert Tari + * Copyright 2021-2023 Robert Tari * * Authors: * Charles Kerr <charles.kerr@canonical.com> @@ -163,25 +163,8 @@ ido_basic_menu_item_update_image (IdoBasicMenuItem *self) } else if (p->icon) { - GtkIconInfo *info; - const gchar *filename; - - info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (), p->icon, 16, 0); - filename = gtk_icon_info_get_filename (info); - - if (filename) - { - GdkPixbuf *pixbuf; - - pixbuf = gdk_pixbuf_new_from_file_at_scale (filename, -1, 16, TRUE, NULL); - gtk_image_set_from_pixbuf (GTK_IMAGE (p->image), pixbuf); - - g_object_unref (pixbuf); - } - - gtk_widget_set_visible (p->image, filename != NULL); - - g_object_unref (info); + gtk_image_set_from_gicon (GTK_IMAGE (p->image), p->icon, GTK_ICON_SIZE_MENU); + gtk_widget_set_visible (p->image, TRUE); } } } |