diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2019-01-10 12:00:46 +0000 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-01-21 09:43:13 +0100 |
| commit | 67ea95468230fd1619235bf54b63c384cb3a9c51 (patch) | |
| tree | f4637dd09a9d947118dd0d3e1b8cf6d9124ef166 | |
| parent | a8260d3876389eb52ca5c62ed4d80cdb7e025c85 (diff) | |
| download | qemu-67ea95468230fd1619235bf54b63c384cb3a9c51.zip qemu-67ea95468230fd1619235bf54b63c384cb3a9c51.tar.gz qemu-67ea95468230fd1619235bf54b63c384cb3a9c51.tar.bz2 | |
ui: fix icon display for GTK frontend under GNOME Shell with Wayland
The icon associated with a GtkWindow is just a hint to window managers
and not all of them will honour it. Some will instead want to show the
icon listed by the .desktop file. The desktop file is located based on
the application ID, which is set using g_set_prgname. QEMU has not
historically provided a desktop file or set its app ID, so it got a
broken icon in GNOME shell, which is now fixed.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20190110120047.25369-3-berrange@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | ui/gtk.c | 1 | ||||
| -rw-r--r-- | ui/qemu.desktop | 8 |
4 files changed, 14 insertions, 0 deletions
@@ -752,6 +752,9 @@ endif mkdir -p "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps"; \ $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu.svg \ "$(DESTDIR)/$(qemu_icondir)/hicolor/scalable/apps/qemu.svg" + mkdir -p "$(DESTDIR)/$(qemu_desktopdir)" + $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ + "$(DESTDIR)/$(qemu_desktopdir)/qemu.desktop" ifdef CONFIG_GTK $(MAKE) -C po $@ endif @@ -5746,6 +5746,7 @@ qemu_moddir=$libdir$confsuffix qemu_datadir=$datadir$confsuffix qemu_localedir="$datadir/locale" qemu_icondir="$datadir/icons" +qemu_desktopdir="$datadir/applications" # We can only support ivshmem if we have eventfd if [ "$eventfd" = "yes" ]; then @@ -6212,6 +6213,7 @@ fi echo "qemu_helperdir=$libexecdir" >> $config_host_mak echo "qemu_localedir=$qemu_localedir" >> $config_host_mak echo "qemu_icondir=$qemu_icondir" >> $config_host_mak +echo "qemu_desktopdir=$qemu_desktopdir" >> $config_host_mak echo "libs_softmmu=$libs_softmmu" >> $config_host_mak echo "GIT=$git" >> $config_host_mak echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak @@ -2226,6 +2226,7 @@ static void gtk_display_init(DisplayState *ds, DisplayOptions *opts) theme = gtk_icon_theme_get_default(); gtk_icon_theme_prepend_search_path(theme, CONFIG_QEMU_ICONDIR); + g_set_prgname("qemu"); s->window = gtk_window_new(GTK_WINDOW_TOPLEVEL); s->vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); diff --git a/ui/qemu.desktop b/ui/qemu.desktop new file mode 100644 index 0000000..20f09f5 --- /dev/null +++ b/ui/qemu.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Version=1.0 +Name=QEMU +Icon=qemu +Type=Application +Terminal=false +Keywords=Emulators;Virtualization;KVM; +NoDisplay=true |