diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-06-21 21:50:26 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2024-06-21 22:38:00 +0200 |
| commit | 9d5ba8bdeda13fc6fde8919619d2a7588bf3fa98 (patch) | |
| tree | 6e83f833cad77ec829f919e85f37850a183dbfc3 | |
| parent | 40d54935a63658845d1e94fe28c510eb86795006 (diff) | |
| download | arctica-greeter-9d5ba8bdeda13fc6fde8919619d2a7588bf3fa98.tar.gz arctica-greeter-9d5ba8bdeda13fc6fde8919619d2a7588bf3fa98.tar.bz2 arctica-greeter-9d5ba8bdeda13fc6fde8919619d2a7588bf3fa98.zip | |
Apply openSUSE patch: arctica-greeter-do-not-force-arctica-greeter.patch.opensuse
| -rw-r--r-- | data/50-arctica-greeter.conf.in | 8 | ||||
| -rw-r--r-- | data/90-arctica-greeter.conf | 7 | ||||
| -rw-r--r-- | data/Makefile.am | 3 | ||||
| -rw-r--r-- | data/arctica-greeter.desktop.in.in | 5 |
4 files changed, 20 insertions, 3 deletions
diff --git a/data/50-arctica-greeter.conf.in b/data/50-arctica-greeter.conf.in index cac4c59..cda016e 100644 --- a/data/50-arctica-greeter.conf.in +++ b/data/50-arctica-greeter.conf.in @@ -1,3 +1,7 @@ [Seat:*] -greeter-session=arctica-greeter -greeter-wrapper=@pkglibexecdir@/lightdm-arctica-greeter-session +# LightDM reads this configuration file independently of the selected greeter, +# so this setting will always make it spawn Arctica Greeter. +# Instead, we'll let LightDM figure out the greeter to use via the +# update-alternatives system. +#greeter-session=arctica-greeter +#greeter-wrapper=@pkglibexecdir@/lightdm-arctica-greeter-session diff --git a/data/90-arctica-greeter.conf b/data/90-arctica-greeter.conf index 4b2584b..a22ad80 100644 --- a/data/90-arctica-greeter.conf +++ b/data/90-arctica-greeter.conf @@ -4,7 +4,12 @@ # system, remove the comment hashes for all options below # we are very serious, we _want_ Arctica Greeter as LightDM greeter!!! -greeter-session=arctica-greeter +# Actually, we're not that serious after all. Since LightDM reads this +# configuration file independently of the selected greeter, this setting will +# always make it spawn Arctica Greeter. +# Instead, we'll let LightDM figure out the greeter to use via the +# update-alternatives system. +#greeter-session=arctica-greeter # don't show local user names at Arctica Greeter login prompt #greeter-hide-users=true diff --git a/data/Makefile.am b/data/Makefile.am index 592730a..aaa25ac 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -37,6 +37,9 @@ arctica-greeter-guest-session-startup.desktop: arctica-greeter-guest-session-sta guestsession_autostartdir = $(datadir)/arctica-greeter/guest-session/skel/.config/autostart guestsession_autostart_DATA = arctica-greeter-guest-session-startup.desktop +arctica-greeter.desktop.in: arctica-greeter.desktop.in.in + $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ + xgreeterdir = $(datarootdir)/xgreeters dist_xgreeter_in_files = arctica-greeter.desktop.in dist_xgreeter_DATA = $(dist_xgreeter_in_files:.desktop.in=.desktop) diff --git a/data/arctica-greeter.desktop.in.in b/data/arctica-greeter.desktop.in.in new file mode 100644 index 0000000..1ee904a --- /dev/null +++ b/data/arctica-greeter.desktop.in.in @@ -0,0 +1,5 @@ +[Desktop Entry] +_Name=Arctica Greeter +_Comment=Arctica Greeter +Exec=@pkglibexecdir@/lightdm-arctica-greeter-session arctica-greeter +Type=Application |