Import upstream version 0.3.96

1 files changed, 28 insertions, 64 deletions

diff --git a/data/Makefile.in b/data/Makefile.in
index faef96e..cea83a7 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -34,12 +34,6 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@BUILD_GTKLOGOUTHELPER_TRUE@am__append_1 = \
-@BUILD_GTKLOGOUTHELPER_TRUE@	$(logout_helper_desktop_in_in_files)
-
-@BUILD_GTKLOGOUTHELPER_TRUE@am__append_2 = \
-@BUILD_GTKLOGOUTHELPER_TRUE@	$(logout_helper_desktop_files)
-
 subdir = data
 DIST_COMMON = $(dist_convert_DATA) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -47,7 +41,8 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
-	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/gcov.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -97,9 +92,8 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(dbus_servicesdir)" \
-	"$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)"
-DATA = $(dbus_services_DATA) $(dist_convert_DATA) \
-	$(logout_helper_DATA)
+	"$(DESTDIR)$(convertdir)"
+DATA = $(dbus_services_DATA) $(dist_convert_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -150,6 +144,8 @@ CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COVERAGE_CFLAGS = @COVERAGE_CFLAGS@
+COVERAGE_LDFLAGS = @COVERAGE_LDFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -166,6 +162,8 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
+GCOVR = @GCOVR@
+GENHTML = @GENHTML@
 GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
 GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GMOFILES = @GMOFILES@
@@ -194,6 +192,7 @@ INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
@@ -239,6 +238,7 @@ SESSIONSERVICE_CFLAGS = @SESSIONSERVICE_CFLAGS@
 SESSIONSERVICE_LIBS = @SESSIONSERVICE_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SHTOOL = @SHTOOL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -308,21 +308,14 @@ dbus_services_DATA = $(service_in_files:.service.in=.service)
 gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml
 convertdir = $(datadir)/GConf/gsettings
 dist_convert_DATA = indicator-session.convert
-EXTRA_DIST = $(service_in_files) $(gsettings_SCHEMAS:.xml=.xml.in) \
-	$(am__append_1)
-CLEANFILES = $(dbus_services_DATA) $(gsettings_SCHEMAS) \
-	$(am__append_2)
-@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_desktop_in_in_files = \
-@BUILD_GTKLOGOUTHELPER_TRUE@	indicator-session-lock-screen.desktop.in.in \
-@BUILD_GTKLOGOUTHELPER_TRUE@	indicator-session-logout.desktop.in.in \
-@BUILD_GTKLOGOUTHELPER_TRUE@	indicator-session-restart.desktop.in.in \
-@BUILD_GTKLOGOUTHELPER_TRUE@	indicator-session-shutdown.desktop.in.in
-
-@BUILD_GTKLOGOUTHELPER_TRUE@logout_helperdir = $(datadir)/applications
-@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_desktop_files = \
-@BUILD_GTKLOGOUTHELPER_TRUE@	$(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop)
-
-@BUILD_GTKLOGOUTHELPER_TRUE@logout_helper_DATA = $(logout_helper_desktop_files)
+EXTRA_DIST = \
+	$(service_in_files)			\
+	$(gsettings_SCHEMAS:.xml=.xml.in)
+
+CLEANFILES = \
+	$(dbus_services_DATA)			\
+	$(gsettings_SCHEMAS)
+
 all: all-recursive
 
 .SUFFIXES:
@@ -398,24 +391,6 @@ uninstall-dist_convertDATA:
 	@list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(convertdir)'; $(am__uninstall_files_from_dir)
-install-logout_helperDATA: $(logout_helper_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(logout_helperdir)" || $(MKDIR_P) "$(DESTDIR)$(logout_helperdir)"
-	@list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(logout_helperdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(logout_helperdir)" || exit $$?; \
-	done
-
-uninstall-logout_helperDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(logout_helperdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -615,7 +590,7 @@ check: check-recursive
 all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)"; do \
+	for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(convertdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -669,8 +644,7 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-dbus_servicesDATA install-dist_convertDATA \
-	install-logout_helperDATA
+install-data-am: install-dbus_servicesDATA install-dist_convertDATA
 
 install-dvi: install-dvi-recursive
 
@@ -714,8 +688,7 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA \
-	uninstall-logout_helperDATA
+uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 	install-am install-strip tags-recursive
@@ -728,14 +701,13 @@ uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA \
 	install-data-am install-dbus_servicesDATA \
 	install-dist_convertDATA install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-logout_helperDATA \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-dbus_servicesDATA \
-	uninstall-dist_convertDATA uninstall-logout_helperDATA
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-dbus_servicesDATA uninstall-dist_convertDATA
 
 
 %.service: %.service.in
@@ -746,14 +718,6 @@ uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA \
 
 @GSETTINGS_RULES@
 
-@BUILD_GTKLOGOUTHELPER_TRUE@@INTLTOOL_DESKTOP_RULE@
-
-@BUILD_GTKLOGOUTHELPER_TRUE@%.desktop.in: %.desktop.in.in
-@BUILD_GTKLOGOUTHELPER_TRUE@	sed \
-@BUILD_GTKLOGOUTHELPER_TRUE@		-e "s|\@libexecdir\@|$(libexecdir)|" \
-@BUILD_GTKLOGOUTHELPER_TRUE@		-e "s|\@bindir\@|$(bindir)|" \
-@BUILD_GTKLOGOUTHELPER_TRUE@		$< > $@
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: