Make app-id and desktop file name match

The application uses an application-id of
"org.virt-manager.virt-viewer" (see function
remote_viewer_new in src/remote-viewer.c).

So far, there was a mismatch between this
application-id and the desktop file name,
resulting e.g. in no proper window icon being
used when running the app on KDE Plasma Wayland.

Adjust the name of the desktop and appdata
files to match the application-id as expected.

Also update the translatable strings using this
command:

    ninja -C _build virt-viewer-pot

Fixes: https://gitlab.com/virt-viewer/virt-viewer/-/issues/135
Signed-off-by: Michael Weghorn <m.weghorn@posteo.de>
This commit is contained in:
Michael Weghorn 2024-02-13 15:45:46 +01:00
parent ee49623348
commit 4676c57486
6 changed files with 13 additions and 13 deletions

View File

@ -1,5 +1,5 @@
if host_machine.system() != 'windows'
desktop = 'remote-viewer.desktop'
desktop = 'org.virt-manager.virt-viewer.desktop'
i18n.merge_file (
type: 'desktop',
@ -22,7 +22,7 @@ if host_machine.system() != 'windows'
install_dir: join_paths(datadir, 'mime', 'packages')
)
metainfo = 'remote-viewer.appdata.xml'
metainfo = 'org.virt-manager.virt-viewer.appdata.xml'
i18n.merge_file (
type: 'xml',

View File

@ -29,7 +29,7 @@
<image>https://virt-manager.org/appdata/en_US/virt-viewer/shared_folder.png</image>
</screenshot>
</screenshots>
<launchable type="desktop-id">remote-viewer.desktop</launchable>
<launchable type="desktop-id">org.virt-manager.virt-viewer.desktop</launchable>
<provides>
<binary>remote-viewer</binary>
<binary>virt-viewer</binary>

View File

@ -1,5 +1,5 @@
data/remote-viewer.appdata.xml.in
data/remote-viewer.desktop.in
data/org.virt-manager.virt-viewer.appdata.xml.in
data/org.virt-manager.virt-viewer.desktop.in
data/virt-viewer-mime.xml.in
src/glib-compat.c
src/ovirt-foreign-menu.c

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: virt-viewer\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-26 11:36+0200\n"
"POT-Creation-Date: 2024-02-13 15:19+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -94,7 +94,7 @@ msgstr ""
msgid "About Virt-Viewer"
msgstr ""
#: data/remote-viewer.desktop.in:4
#: data/org.virt-manager.virt-viewer.desktop.in:4
msgid "Access remote desktops"
msgstr ""
@ -477,12 +477,12 @@ msgid ""
"Remap keys format key=keymod+key e.g. F1=SHIFT+CTRL+F1,1=SHIFT+F1,ALT_L=Void"
msgstr ""
#: data/remote-viewer.appdata.xml.in:6 data/remote-viewer.desktop.in:3
#: src/remote-viewer-main.c:39
#: data/org.virt-manager.virt-viewer.appdata.xml.in:6
#: data/org.virt-manager.virt-viewer.desktop.in:3 src/remote-viewer-main.c:39
msgid "Remote Viewer"
msgstr ""
#: data/remote-viewer.appdata.xml.in:9
#: data/org.virt-manager.virt-viewer.appdata.xml.in:9
msgid ""
"Remote Viewer provides a graphical viewer for the guest OS display. At this "
"time it supports guest OS using the VNC or SPICE protocols. Further "
@ -495,7 +495,7 @@ msgstr ""
msgid "Remote viewer client"
msgstr ""
#: data/remote-viewer.appdata.xml.in:7
#: data/org.virt-manager.virt-viewer.appdata.xml.in:7
msgid "Remotely access virtual machines"
msgstr ""

View File

@ -84,8 +84,8 @@ the display, and libvirt for looking up VNC/SPICE server details.
%{_bindir}/%{name}
%{_bindir}/remote-viewer
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/applications/remote-viewer.desktop
%{_datadir}/metainfo/remote-viewer.appdata.xml
%{_datadir}/applications/org.virt-manager.virt-viewer.desktop
%{_datadir}/metainfo/org.virt-manager.virt-viewer.appdata.xml
%{_datadir}/mime/packages/virt-viewer-mime.xml
%{_mandir}/man1/virt-viewer.1*
%{_mandir}/man1/remote-viewer.1*