diff options
| author | Ted Gould <ted@gould.cx> | 2014-02-19 22:34:41 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2014-02-19 22:34:41 -0600 |
| commit | 20ef67d77138f70a0cd637189acf4c606da2773c (patch) | |
| tree | 495ebf813a9a1dcd33873acf3b526913a845e1e0 | |
| parent | c9d231dfed8063f705b68cf46d7176ecdfb7ca72 (diff) | |
| download | ayatana-indicator-keyboard-20ef67d77138f70a0cd637189acf4c606da2773c.tar.gz ayatana-indicator-keyboard-20ef67d77138f70a0cd637189acf4c606da2773c.tar.bz2 ayatana-indicator-keyboard-20ef67d77138f70a0cd637189acf4c606da2773c.zip | |
Add in the upstart xdg override
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 16 | ||||
| -rw-r--r-- | data/indicator-keyboard.desktop.in | 8 | ||||
| -rw-r--r-- | data/upstart/indicator-keyboard.desktop.in | 9 |
4 files changed, 33 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index dc2f0bae..5c09f8fc 100644 --- a/configure.ac +++ b/configure.ac @@ -89,6 +89,7 @@ AC_SUBST(COVERAGE_LDFLAGS) AC_CONFIG_FILES([Makefile data/Makefile + data/upstart/Makefile lib/Makefile po/Makefile.in tests/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 9c42ccf0..91c94dfb 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,3 +1,6 @@ + +SUBDIRS = upstart + ########################### # Icon Generator ########################### @@ -47,6 +50,16 @@ upstart_jobs_DATA = indicator-keyboard.conf $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ ########################### +# XDG Autostart File +########################### + +xdg_autostartdir = /etc/xdg/autostart +xdg_autostart_DATA = indicator-keyboard.desktop + +%.desktop: %.desktop.in + $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + +########################### # Indicator Config ########################### @@ -85,5 +98,6 @@ gschemas.compiled: $(gsettings_SCHEMAS) EXTRA_DIST = $(dist_service_DATA) \ $(dist_indicator_DATA) \ $(gsettings_SCHEMAS) \ - indicator-keyboard.conf.in + indicator-keyboard.conf.in \ + indicator-keyboard.desktop.in diff --git a/data/indicator-keyboard.desktop.in b/data/indicator-keyboard.desktop.in new file mode 100644 index 00000000..9c611160 --- /dev/null +++ b/data/indicator-keyboard.desktop.in @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Indicator Keyboard +Exec=@libexecdir@/indicator-keyboard-service +OnlyShowIn=Unity; +NoDisplay=true +StartupNotify=false +Terminal=false diff --git a/data/upstart/indicator-keyboard.desktop.in b/data/upstart/indicator-keyboard.desktop.in new file mode 100644 index 00000000..229199f1 --- /dev/null +++ b/data/upstart/indicator-keyboard.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Indicator Keyboard +Exec=@libexecdir@/indicator-keyboard-service +OnlyShowIn=Unity; +NoDisplay=true +StartupNotify=false +Terminal=false +Hidden=true |