Import upstream version 0.3.15

3 files changed, 85 insertions, 11 deletions

diff --git a/tools/80indicator-debugging b/tools/80indicator-debugging
new file mode 100644
index 0000000..f21559c
--- /dev/null
+++ b/tools/80indicator-debugging
@@ -0,0 +1,14 @@
+# These are environment variables that effect the behavior
+# of libindicator's service manager and indicator service
+# objects.  They turn off various robustness features that
+# make debugging difficult and are not recommended for
+# daily use.  Development use only!
+
+# Timeout after 1 minute
+export INDICATOR_SERVICE_SHUTDOWN_TIMEOUT=60000
+
+# If no one connects, still stay alive
+export INDICATOR_ALLOW_NO_WATCHERS=1
+
+# Don't restart the services if they crash
+export INDICATOR_SERVICE_RESTART_DISABLE=1
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5e5ef8d..6c67491 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,3 +1,8 @@
+if USE_GTK3
+INDICATOR_LIB = -lindicator3
+else
+INDICATOR_LIB = -lindicator
+endif
 
 libexec_PROGRAMS = \
 	indicator-loader
@@ -17,5 +22,10 @@ indicator_loader_CFLAGS = \
 indicator_loader_LDADD = \
 	$(LIBINDICATOR_LIBS) \
 	-L$(top_builddir)/libindicator/.libs \
-	-lindicator
+	$(INDICATOR_LIB)
 
+xsessiondir = $(sysconfdir)/X11/Xsession.d
+
+xsession_DATA = 80indicator-debugging
+
+EXTRA_DIST = $(xsession_DATA)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 8c6b3b0..f5a77ff 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -15,6 +15,7 @@
 
 @SET_MAKE@
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
@@ -45,13 +46,14 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(libexecdir)"
+am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(xsessiondir)"
 PROGRAMS = $(libexec_PROGRAMS)
 am_indicator_loader_OBJECTS =  \
 	indicator_loader-indicator-loader.$(OBJEXT)
 indicator_loader_OBJECTS = $(am_indicator_loader_OBJECTS)
 am__DEPENDENCIES_1 =
-indicator_loader_DEPENDENCIES = $(am__DEPENDENCIES_1)
+indicator_loader_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
 am__v_lt_0 = --silent
@@ -87,6 +89,28 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(indicator_loader_SOURCES)
 DIST_SOURCES = $(indicator_loader_SOURCES)
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+DATA = $(xsession_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -214,6 +238,8 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+@USE_GTK3_FALSE@INDICATOR_LIB = -lindicator
+@USE_GTK3_TRUE@INDICATOR_LIB = -lindicator3
 
 #############################
 # Indicator Loader
@@ -229,8 +255,11 @@ indicator_loader_CFLAGS = \
 indicator_loader_LDADD = \
 	$(LIBINDICATOR_LIBS) \
 	-L$(top_builddir)/libindicator/.libs \
-	-lindicator
+	$(INDICATOR_LIB)
 
+xsessiondir = $(sysconfdir)/X11/Xsession.d
+xsession_DATA = 80indicator-debugging
+EXTRA_DIST = $(xsession_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -365,6 +394,26 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
+install-xsessionDATA: $(xsession_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(xsessiondir)" || $(MKDIR_P) "$(DESTDIR)$(xsessiondir)"
+	@list='$(xsession_DATA)'; test -n "$(xsessiondir)" || 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)$(xsessiondir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(xsessiondir)" || exit $$?; \
+	done
+
+uninstall-xsessionDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(xsession_DATA)'; test -n "$(xsessiondir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(xsessiondir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(xsessiondir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -450,9 +499,9 @@ distdir: $(DISTFILES)
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(PROGRAMS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(libexecdir)"; do \
+	for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(xsessiondir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -503,7 +552,7 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-xsessionDATA
 
 install-dvi: install-dvi-am
 
@@ -549,7 +598,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-libexecPROGRAMS
+uninstall-am: uninstall-libexecPROGRAMS uninstall-xsessionDATA
 
 .MAKE: install-am install-strip
 
@@ -561,11 +610,12 @@ uninstall-am: uninstall-libexecPROGRAMS
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am \
 	install-libexecPROGRAMS install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-ps install-ps-am install-strip install-xsessionDATA \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-libexecPROGRAMS
+	tags uninstall uninstall-am uninstall-libexecPROGRAMS \
+	uninstall-xsessionDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.