diff options
| -rw-r--r-- | data/Makefile.am | 7 | ||||
| -rw-r--r-- | src/application-service.c | 19 |
2 files changed, 4 insertions, 22 deletions
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; } |