From 2f202ab68ab2185cc6a0cf32d92fc9f30a573d5f Mon Sep 17 00:00:00 2001 From: Jake Dane <3689-jakedane@users.noreply.gitlab.gnome.org> Date: Sun, 11 Sep 2022 19:54:29 +0000 Subject: desktop: Remove obsolete Bugzilla entries The `X-GNOME-Bugzilla-*` entries were for use by bug-buddy, a GNOME 2 technology that's been gone for over a decade. These entries are obsolete and can be removed from the desktop files. The desktop files then have no variables so do not need to be configured. They are renamed from `*.in.in` to `*.in` to reflect that and build files are updated for this change. --- daemon/.gitignore | 3 --- daemon/Makefile.am | 14 ++++++-------- daemon/gnome-keyring-pkcs11.desktop.in | 10 ++++++++++ daemon/gnome-keyring-pkcs11.desktop.in.in | 14 -------------- daemon/gnome-keyring-secrets.desktop.in | 10 ++++++++++ daemon/gnome-keyring-secrets.desktop.in.in | 14 -------------- daemon/gnome-keyring-ssh.desktop.in | 9 +++++++++ daemon/gnome-keyring-ssh.desktop.in.in | 13 ------------- po/POTFILES.in | 6 +++--- po/POTFILES.skip | 3 --- 10 files changed, 38 insertions(+), 58 deletions(-) create mode 100644 daemon/gnome-keyring-pkcs11.desktop.in delete mode 100644 daemon/gnome-keyring-pkcs11.desktop.in.in create mode 100644 daemon/gnome-keyring-secrets.desktop.in delete mode 100644 daemon/gnome-keyring-secrets.desktop.in.in create mode 100644 daemon/gnome-keyring-ssh.desktop.in delete mode 100644 daemon/gnome-keyring-ssh.desktop.in.in diff --git a/daemon/.gitignore b/daemon/.gitignore index 47cec83d..da51999f 100644 --- a/daemon/.gitignore +++ b/daemon/.gitignore @@ -4,8 +4,5 @@ /org.freedesktop.secrets.service /org.freedesktop.impl.portal.Secret.service /gnome-keyring-pkcs11.desktop -/gnome-keyring-pkcs11.desktop.in /gnome-keyring-secrets.desktop -/gnome-keyring-secrets.desktop.in /gnome-keyring-ssh.desktop -/gnome-keyring-ssh.desktop.in diff --git a/daemon/Makefile.am b/daemon/Makefile.am index aa0d3a8d..a6424f9d 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -57,14 +57,13 @@ EXTRA_DIST += \ endif desktopdir = $(sysconfdir)/xdg/autostart -desktop_in_in_files = \ - daemon/gnome-keyring-pkcs11.desktop.in.in \ - daemon/gnome-keyring-secrets.desktop.in.in \ - daemon/gnome-keyring-ssh.desktop.in.in \ +desktop_in_files = \ + daemon/gnome-keyring-pkcs11.desktop.in \ + daemon/gnome-keyring-secrets.desktop.in \ + daemon/gnome-keyring-ssh.desktop.in \ $(NULL) -desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -.desktop.in.in.desktop.in: +$(desktop_DATA): $(desktop_in_files) $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ portaldir = $(datadir)/xdg-desktop-portal/portals @@ -72,8 +71,7 @@ dist_portal_DATA = daemon/gnome-keyring.portal EXTRA_DIST += \ $(service_in_files) \ - $(desktop_in_files) \ - $(desktop_in_in_files) + $(desktop_in_files) CLEANFILES += \ $(service_DATA) \ diff --git a/daemon/gnome-keyring-pkcs11.desktop.in b/daemon/gnome-keyring-pkcs11.desktop.in new file mode 100644 index 00000000..3e36603f --- /dev/null +++ b/daemon/gnome-keyring-pkcs11.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=Certificate and Key Storage +Comment=GNOME Keyring: PKCS#11 Component +Exec=@bindir@/gnome-keyring-daemon --start --components=pkcs11 +OnlyShowIn=GNOME;Unity;MATE; +NoDisplay=true +X-GNOME-Autostart-Phase=PreDisplayServer +X-GNOME-AutoRestart=false +X-GNOME-Autostart-Notify=true diff --git a/daemon/gnome-keyring-pkcs11.desktop.in.in b/daemon/gnome-keyring-pkcs11.desktop.in.in deleted file mode 100644 index b43e1e9d..00000000 --- a/daemon/gnome-keyring-pkcs11.desktop.in.in +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Certificate and Key Storage -Comment=GNOME Keyring: PKCS#11 Component -Exec=@bindir@/gnome-keyring-daemon --start --components=pkcs11 -OnlyShowIn=GNOME;Unity;MATE; -NoDisplay=true -X-GNOME-Autostart-Phase=PreDisplayServer -X-GNOME-AutoRestart=false -X-GNOME-Autostart-Notify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=gnome-keyring -X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=@VERSION@ diff --git a/daemon/gnome-keyring-secrets.desktop.in b/daemon/gnome-keyring-secrets.desktop.in new file mode 100644 index 00000000..799caeea --- /dev/null +++ b/daemon/gnome-keyring-secrets.desktop.in @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Name=Secret Storage Service +Comment=GNOME Keyring: Secret Service +Exec=@bindir@/gnome-keyring-daemon --start --components=secrets +OnlyShowIn=GNOME;Unity;MATE; +NoDisplay=true +X-GNOME-Autostart-Phase=PreDisplayServer +X-GNOME-AutoRestart=false +X-GNOME-Autostart-Notify=true diff --git a/daemon/gnome-keyring-secrets.desktop.in.in b/daemon/gnome-keyring-secrets.desktop.in.in deleted file mode 100644 index dd9deec7..00000000 --- a/daemon/gnome-keyring-secrets.desktop.in.in +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Secret Storage Service -Comment=GNOME Keyring: Secret Service -Exec=@bindir@/gnome-keyring-daemon --start --components=secrets -OnlyShowIn=GNOME;Unity;MATE; -NoDisplay=true -X-GNOME-Autostart-Phase=PreDisplayServer -X-GNOME-AutoRestart=false -X-GNOME-Autostart-Notify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=gnome-keyring -X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=@VERSION@ diff --git a/daemon/gnome-keyring-ssh.desktop.in b/daemon/gnome-keyring-ssh.desktop.in new file mode 100644 index 00000000..fd7657a4 --- /dev/null +++ b/daemon/gnome-keyring-ssh.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=SSH Key Agent +Comment=GNOME Keyring: SSH Agent +Exec=@bindir@/gnome-keyring-daemon --start --components=ssh +OnlyShowIn=GNOME;Unity;MATE; +X-GNOME-Autostart-Phase=PreDisplayServer +X-GNOME-AutoRestart=false +X-GNOME-Autostart-Notify=true diff --git a/daemon/gnome-keyring-ssh.desktop.in.in b/daemon/gnome-keyring-ssh.desktop.in.in deleted file mode 100644 index 38aa24cb..00000000 --- a/daemon/gnome-keyring-ssh.desktop.in.in +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Type=Application -Name=SSH Key Agent -Comment=GNOME Keyring: SSH Agent -Exec=@bindir@/gnome-keyring-daemon --start --components=ssh -OnlyShowIn=GNOME;Unity;MATE; -X-GNOME-Autostart-Phase=PreDisplayServer -X-GNOME-AutoRestart=false -X-GNOME-Autostart-Notify=true -X-GNOME-Bugzilla-Bugzilla=GNOME -X-GNOME-Bugzilla-Product=gnome-keyring -X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=@VERSION@ diff --git a/po/POTFILES.in b/po/POTFILES.in index 0c9cd4b1..b3a4ef24 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,9 +3,9 @@ daemon/dbus/gkd-secret-change.c daemon/dbus/gkd-secret-create.c daemon/dbus/gkd-secret-unlock.c -daemon/gnome-keyring-pkcs11.desktop.in.in -daemon/gnome-keyring-secrets.desktop.in.in -daemon/gnome-keyring-ssh.desktop.in.in +daemon/gnome-keyring-pkcs11.desktop.in +daemon/gnome-keyring-secrets.desktop.in +daemon/gnome-keyring-ssh.desktop.in daemon/login/gkd-login.c daemon/login/gkd-login-interaction.c daemon/ssh-agent/gkd-ssh-agent-interaction.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index e652b97a..4ed1ef69 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1,6 +1,3 @@ -daemon/gnome-keyring-secrets.desktop.in -daemon/gnome-keyring-ssh.desktop.in -daemon/gnome-keyring-pkcs11.desktop.in daemon/org.freedesktop.secrets.service.in daemon/org.gnome.keyring.service.in -- cgit v1.2.1