[gnome-settings-daemon] main: Remove localeexec wrapper
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] main: Remove localeexec wrapper
- Date: Wed, 28 Sep 2016 12:12:54 +0000 (UTC)
commit e1297bd30725b798bd283c351502ffd30ce31f3a
Author: Bastien Nocera <hadess hadess net>
Date: Sat Sep 24 15:35:28 2016 +0200
main: Remove localeexec wrapper
Now that gnome-session handles exporting locale information, we don't
need to do this ourselves anymore.
See https://bugzilla.gnome.org/show_bug.cgi?id=756324
https://bugzilla.gnome.org/show_bug.cgi?id=766180
data/gnome-settings-daemon.desktop.in.in | 2 +-
gnome-settings-daemon/Makefile.am | 7 -------
2 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/data/gnome-settings-daemon.desktop.in.in b/data/gnome-settings-daemon.desktop.in.in
index ff71eee..c5a5518 100644
--- a/data/gnome-settings-daemon.desktop.in.in
+++ b/data/gnome-settings-daemon.desktop.in.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
_Name=GNOME Settings Daemon
-Exec=@libexecdir@/gnome-settings-daemon-localeexec
+Exec=@libexecdir@/gnome-settings-daemon
OnlyShowIn=GNOME;
NoDisplay=true
X-GNOME-Autostart-Phase=Initialization
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index dd901c7..b6beb0f 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -93,19 +93,12 @@ gsddir = $(libexecdir)
gsd_PROGRAMS = \
gnome-settings-daemon
-gsd_SCRIPTS = \
- gnome-settings-daemon-localeexec
-
EXTRA_DIST = \
- gnome-settings-daemon-localeexec.in \
org.gnome.SessionManager.xml \
org.gnome.ScreenSaver.xml \
org.gnome.Shell.xml \
$(NULL)
-gnome-settings-daemon-localeexec: gnome-settings-daemon-localeexec.in
- $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" -e "s|\@prefix\@|$(prefix)|" $< > $@.tmp && mv
$@.tmp $@
-
apidir = $(includedir)/gnome-settings-daemon-$(GSD_API_VERSION)/gnome-settings-daemon
api_DATA = \
gnome-settings-plugin.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]