[gnome-shell-extensions] classic: Drop separate gnome-session definition
- From: Benjamin Berg <bberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell-extensions] classic: Drop separate gnome-session definition
- Date: Fri, 31 Jul 2020 14:02:14 +0000 (UTC)
commit 9a78c7e4f40ca6d327e34542c2c0e3590479d73c
Author: Florian Müllner <fmuellner gnome org>
Date: Mon Jul 13 19:35:30 2020 +0200
classic: Drop separate gnome-session definition
Originally the classic session replaced `gnome-shell.desktop` with
`gnome-shell-classic.desktop` (to add the --mode=classic parameter)
and added `nautilus-classic.desktop` (to force on desktop icons).
Neither is the case anymore (and hasn't been for years): Nowadays the
only expected difference is the GNOME_SHELL_SESSION_MODE variable and
the DesktopNames field, which are both set from the session .desktop
file rather than the gnome-session session definition.
Any difference in the latter - like not starting the USBProtection
plugin and missing systemd user session support - are bugs. The
easiest way to avoid those in the future is by removing the obsolete
duplication that enables them, so do just that.
https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/126
data/gnome-classic.desktop.in | 2 +-
data/gnome-classic.session.desktop.in | 3 ---
data/meson.build | 24 +++++++++---------------
3 files changed, 10 insertions(+), 19 deletions(-)
---
diff --git a/data/gnome-classic.desktop.in b/data/gnome-classic.desktop.in
index 055ce641..5df6821f 100644
--- a/data/gnome-classic.desktop.in
+++ b/data/gnome-classic.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=GNOME Classic
Comment=This session logs you into GNOME Classic
-Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session --session gnome-classic
+Exec=env GNOME_SHELL_SESSION_MODE=classic gnome-session
TryExec=gnome-session
Type=Application
DesktopNames=GNOME-Classic;GNOME;
diff --git a/data/meson.build b/data/meson.build
index 02ddf7d0..5e1c6cf2 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,18 +1,12 @@
-sessions = [
- ['gnome-classic.session.desktop.in', sessiondir],
- ['gnome-classic.desktop.in', xsessiondir]
-]
-foreach s : sessions
- name_array = s[0].split('.')
- i18n.merge_file('',
- input: s[0],
- output: '.'.join([name_array[0], name_array[1]]),
- po_dir: '../po',
- install: true,
- install_dir: s[1],
- type: 'desktop'
- )
-endforeach
+session_desktop = 'gnome-classic.desktop'
+i18n.merge_file('',
+ input: session_desktop + '.in',
+ output: session_desktop,
+ po_dir: '../po',
+ install: true,
+ install_dir: xsessiondir,
+ type: 'desktop'
+)
classic_uuids = []
foreach e : classic_extensions
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]