From 74b3c094874d5bd4becebe69eca9b06c5fc4e542 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 29 May 2013 14:37:22 -0500 Subject: Adding an upstart job config --- data/Makefile.am | 11 ++++++++++- data/indicator-session.conf.in | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 data/indicator-session.conf.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 27b5ea2..69ac65d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -9,6 +9,13 @@ dbus_services_DATA = $(service_in_files:.service.in=.service) %.service: %.service.in sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ +upstart_jobsdir = $(datadir)/upstart/sessions/ +upstart_jobs_in_files = indicator-session.conf.in +upstart_jobs_DATA = $(upstart_jobs_in_files:.conf.in=.conf) + +%.conf: %.conf.in + sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + @INTLTOOL_SCHEMAS_RULE@ @INTLTOOL_XML_NOMERGE_RULE@ @@ -20,8 +27,10 @@ dist_convert_DATA = indicator-session.convert EXTRA_DIST = \ $(service_in_files) \ + $(upstart_jobs_in_files) \ $(gsettings_SCHEMAS:.xml=.xml.in) CLEANFILES = \ - $(dbus_services_DATA) \ + $(dbus_services_DATA) \ + $(upstart_jobs_DATA) \ $(gsettings_SCHEMAS) diff --git a/data/indicator-session.conf.in b/data/indicator-session.conf.in new file mode 100644 index 0000000..3a512df --- /dev/null +++ b/data/indicator-session.conf.in @@ -0,0 +1,15 @@ +description "Indicator Session Service" +author "Ted Gould " + +# NOTE: Limiting only to Unity 7 right now as it's still using +# dbusmenu. That can be lifted after it is ported to GMenu + +start on indicators-loaded and xsession SESSION=ubuntu +stop on desktop-end + +env G_MESSAGES_DEBUG=all +export G_MESSAGES_DEBUG + +respawn + +exec @libexecdir@/indicator-session-service -- cgit v1.2.3 From 777014b4876e96eac0e6be5edf9ff72b3899ff3b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 29 May 2013 14:42:50 -0500 Subject: Dropping the DBus service file --- data/Makefile.am | 9 --------- data/indicator-session.service.in | 3 --- 2 files changed, 12 deletions(-) delete mode 100644 data/indicator-session.service.in (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 69ac65d..a1a1c3b 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,13 +2,6 @@ SUBDIRS = \ icons \ extra-sessions -dbus_servicesdir = $(DBUSSERVICEDIR) -service_in_files = indicator-session.service.in -dbus_services_DATA = $(service_in_files:.service.in=.service) - -%.service: %.service.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - upstart_jobsdir = $(datadir)/upstart/sessions/ upstart_jobs_in_files = indicator-session.conf.in upstart_jobs_DATA = $(upstart_jobs_in_files:.conf.in=.conf) @@ -26,11 +19,9 @@ convertdir = $(datadir)/GConf/gsettings dist_convert_DATA = indicator-session.convert EXTRA_DIST = \ - $(service_in_files) \ $(upstart_jobs_in_files) \ $(gsettings_SCHEMAS:.xml=.xml.in) CLEANFILES = \ - $(dbus_services_DATA) \ $(upstart_jobs_DATA) \ $(gsettings_SCHEMAS) diff --git a/data/indicator-session.service.in b/data/indicator-session.service.in deleted file mode 100644 index a4d10a1..0000000 --- a/data/indicator-session.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=com.canonical.indicator.session -Exec=@libexecdir@/indicator-session-service -- cgit v1.2.3 From 0c56911e79bec168faa57e95531456f45b9e175a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 27 Aug 2013 14:42:38 -0500 Subject: Drop session specification --- data/indicator-session.conf.in | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'data') diff --git a/data/indicator-session.conf.in b/data/indicator-session.conf.in index d5c4c8c..d661001 100644 --- a/data/indicator-session.conf.in +++ b/data/indicator-session.conf.in @@ -1,9 +1,6 @@ description "Indicator Session Service" -# NOTE: Limiting only to Unity 7 right now as it's only needed -# on the desktop - -start on (indicators-loaded or indicator-services-start) and xsession SESSION=ubuntu +start on indicators-loaded or indicator-services-start stop on desktop-end or indicator-services-end env G_MESSAGES_DEBUG=all -- cgit v1.2.3 From 77ec76b2cebdce34e6fdd3996003a31ac573203a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 27 Aug 2013 15:09:48 -0500 Subject: Dropping debugging for system-wide support --- data/indicator-session.conf.in | 3 --- 1 file changed, 3 deletions(-) (limited to 'data') diff --git a/data/indicator-session.conf.in b/data/indicator-session.conf.in index d661001..6bd93a2 100644 --- a/data/indicator-session.conf.in +++ b/data/indicator-session.conf.in @@ -3,9 +3,6 @@ description "Indicator Session Service" start on indicators-loaded or indicator-services-start stop on desktop-end or indicator-services-end -env G_MESSAGES_DEBUG=all -export G_MESSAGES_DEBUG - respawn exec @pkglibexecdir@/indicator-session-service -- cgit v1.2.3 From 67c319bdd36972d74977323ed181574902bfe658 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 28 Oct 2013 17:31:50 -0700 Subject: XDG Autostart file --- data/CMakeLists.txt | 21 +++++++++++++++++++++ data/indicator-session.desktop.in | 9 +++++++++ 2 files changed, 30 insertions(+) create mode 100644 data/indicator-session.desktop.in (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index d52d388..163e2cd 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -37,6 +37,27 @@ install (FILES "${UPSTART_JOB_FILE}" DESTINATION "${UPSTART_JOB_DIR}") +## +## XDG Autostart Config File +## + +# where to install +set (XDG_AUTOSTART_DIR "/etc/xdg/autostart") +message (STATUS "${XDG_AUTOSTART_DIR} is the XDG Autostart install dir") + +set (XDG_AUTOSTART_NAME "${CMAKE_PROJECT_NAME}.desktop") +set (XDG_AUTOSTART_FILE "${CMAKE_CURRENT_BINARY_DIR}/${XDG_AUTOSTART_NAME}") +set (XDG_AUTOSTART_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${XDG_AUTOSTART_NAME}.in") + +# build it +set (pkglibexecdir "${CMAKE_INSTALL_FULL_PKGLIBEXECDIR}") +configure_file ("${XDG_AUTOSTART_FILE_IN}" "${XDG_AUTOSTART_FILE}") + +# install it +install (FILES "${XDG_AUTOSTART_FILE}" + DESTINATION "${XDG_AUTOSTART_DIR}") + + ## ## Unity Indicator File ## diff --git a/data/indicator-session.desktop.in b/data/indicator-session.desktop.in new file mode 100644 index 0000000..b6d289d --- /dev/null +++ b/data/indicator-session.desktop.in @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Indicator Session +Exec=@pkglibexecdir@/indicator-session-service +NotShowIn=Unity; +NoDisplay=true +StartupNotify=false +Terminal=false + -- cgit v1.2.3