From f179a2c7f91497854fa787eb0c65e547a791f038 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 19 Feb 2014 21:27:31 -0600 Subject: Build the upstart desktop file in its own directory --- data/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index 77ec71d..6f46c2e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,4 +1,6 @@ +SUBDIRS = upstart + upstart_jobsdir = $(datadir)/upstart/sessions/ upstart_jobs_DATA = indicator-application.conf -- cgit v1.2.3 From dd359a11a25e6aa082d405c56c5b1255cd844c76 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 19 Feb 2014 21:31:05 -0600 Subject: Switch to using pkglibexecdir --- data/Makefile.am | 4 ++-- data/indicator-application.conf.in | 2 +- data/indicator-application.desktop.in | 2 +- data/upstart/Makefile.am | 4 ++-- data/upstart/indicator-application.desktop.in | 2 +- src/Makefile.am | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index 6f46c2e..3f9f7ad 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,13 +5,13 @@ upstart_jobsdir = $(datadir)/upstart/sessions/ upstart_jobs_DATA = indicator-application.conf %.conf: %.conf.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ xdg_autostartdir = /etc/xdg/autostart xdg_autostart_DATA = indicator-application.desktop %.desktop: %.desktop.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ overridedir = $(pkgdatadir) override_DATA = ordering-override.keyfile diff --git a/data/indicator-application.conf.in b/data/indicator-application.conf.in index 15a318d..d3a103d 100644 --- a/data/indicator-application.conf.in +++ b/data/indicator-application.conf.in @@ -11,6 +11,6 @@ emits appindicators-start appindicators-end respawn respawn limit 2 10 -exec @libexecdir@/indicator-application-service +exec @pkglibexecdir@/indicator-application-service pre-stop exec initctl emit appindicators-end diff --git a/data/indicator-application.desktop.in b/data/indicator-application.desktop.in index 2783781..c724a0f 100644 --- a/data/indicator-application.desktop.in +++ b/data/indicator-application.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Indicator Application -Exec=@libexecdir@/indicator-application-service +Exec=@pkglibexecdir@/indicator-application-service StartupNotify=false Terminal=false OnlyShowIn=Unity;XFCE; diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am index a384c75..f7bc09e 100644 --- a/data/upstart/Makefile.am +++ b/data/upstart/Makefile.am @@ -1,9 +1,9 @@ -xdg_autostartdir = $(datadir)/upstart/xdg/autostart +xdg_autostartdir = $(pkgdatadir)/upstart/xdg/autostart xdg_autostart_DATA = indicator-application.desktop %.desktop: %.desktop.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + sed -e "s|\@libexecdir\@|$(pkglibexecdir)|" $< > $@ EXTRA_DIST = \ indicator-application.desktop.in diff --git a/data/upstart/indicator-application.desktop.in b/data/upstart/indicator-application.desktop.in index ee1c4a1..f4ba076 100644 --- a/data/upstart/indicator-application.desktop.in +++ b/data/upstart/indicator-application.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Indicator Application -Exec=@libexecdir@/indicator-application-service +Exec=@pkglibexecdir@/indicator-application-service StartupNotify=false Terminal=false OnlyShowIn=Unity;XFCE; diff --git a/src/Makefile.am b/src/Makefile.am index a68c007..4174cbc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ libapplication_la_LDFLAGS = $(COVERAGE_LDFLAGS) \ # Service ################################## -libexec_PROGRAMS = indicator-application-service +pkglibexec_PROGRAMS = indicator-application-service BUILT_SOURCES += \ application-service-marshal.h \ -- cgit v1.2.3 From e48b26bcffdf75b4454611f88018c1a783c2e9c9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 Feb 2014 14:48:59 -0600 Subject: Removes the indicator service code --- data/Makefile.am | 7 ++++--- src/application-service.c | 19 ------------------- 2 files changed, 4 insertions(+), 22 deletions(-) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index 3f9f7ad..b26a669 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,13 +5,13 @@ upstart_jobsdir = $(datadir)/upstart/sessions/ upstart_jobs_DATA = indicator-application.conf %.conf: %.conf.in - sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ + $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ xdg_autostartdir = /etc/xdg/autostart xdg_autostart_DATA = indicator-application.desktop %.desktop: %.desktop.in - sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ + $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ overridedir = $(pkgdatadir) override_DATA = ordering-override.keyfile @@ -22,5 +22,6 @@ EXTRA_DIST = \ ordering-override.keyfile CLEANFILES = \ - indicator-application.conf + indicator-application.conf \ + indicator-application.desktop diff --git a/src/application-service.c b/src/application-service.c index 5262d9d..21e3f9d 100644 --- a/src/application-service.c +++ b/src/application-service.c @@ -32,30 +32,12 @@ static GMainLoop * mainloop = NULL; static ApplicationServiceAppstore * appstore = NULL; /* Interface for applications */ static ApplicationServiceWatcher * watcher = NULL; -/* The service management interface */ -static IndicatorService * service = NULL; -/* Recieves the disonnection signal from the service - object and closes the mainloop. */ -static void -service_disconnected (IndicatorService * service, gpointer data) -{ - g_debug("Service disconnected"); - if (mainloop != NULL) { - g_main_loop_quit(mainloop); - } - return; -} - /* Builds up the core objects and puts us spinning into a main loop. */ int main (int argc, char ** argv) { - /* Bring us up as a basic indicator service */ - service = indicator_service_new_version(INDICATOR_APPLICATION_DBUS_ADDR, INDICATOR_APPLICATION_SERVICE_VERSION); - g_signal_connect(G_OBJECT(service), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_disconnected), NULL); - /* Building our app store */ appstore = application_service_appstore_new(); @@ -69,7 +51,6 @@ main (int argc, char ** argv) /* Unref'ing all the objects */ g_object_unref(G_OBJECT(watcher)); g_object_unref(G_OBJECT(appstore)); - g_object_unref(G_OBJECT(service)); return 0; } -- cgit v1.2.3