From ecc6acd2a576fcc11d51ded532f570fb29ab475e Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Wed, 6 Oct 2010 10:58:49 -0400 Subject: instead of always building gtk2 and gtk3, add a --with-gtk= flag to configure to specify which to build with --- tools/Makefile.am | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/Makefile.am b/tools/Makefile.am index 5e5ef8d..d2964f9 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,5 @@ indicator_loader_CFLAGS = \ indicator_loader_LDADD = \ $(LIBINDICATOR_LIBS) \ -L$(top_builddir)/libindicator/.libs \ - -lindicator + $(INDICATOR_LIB) -- cgit v1.2.3 From fc94eab8fd3749f0c9c68451f359c9e1efcdfd3b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Oct 2010 12:24:12 -0500 Subject: All the environment flags we should set for debugging --- tools/indicator-debugging | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tools/indicator-debugging (limited to 'tools') diff --git a/tools/indicator-debugging b/tools/indicator-debugging new file mode 100644 index 0000000..afc2093 --- /dev/null +++ b/tools/indicator-debugging @@ -0,0 +1,8 @@ +# 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 -- cgit v1.2.3 From 2e3ea76f4947c1148f6c3a8b870e0e319deaa20c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Oct 2010 12:37:08 -0500 Subject: Installing the environment file in the session dir --- tools/Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tools') diff --git a/tools/Makefile.am b/tools/Makefile.am index 5e5ef8d..4b959a5 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -19,3 +19,8 @@ indicator_loader_LDADD = \ -L$(top_builddir)/libindicator/.libs \ -lindicator +xsessiondir = $(sysconfdir)/X11/Xsession.d + +xsession_DATA = indicator-debugging + +EXTRA_DIST = $(xsession_DATA) -- cgit v1.2.3 From 0f99ed218d71e96d2fa5f10c5f0791b61445f8aa Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Oct 2010 12:39:13 -0500 Subject: Adding a number in the name --- tools/80indicator-debugging | 8 ++++++++ tools/Makefile.am | 2 +- tools/indicator-debugging | 8 -------- 3 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 tools/80indicator-debugging delete mode 100644 tools/indicator-debugging (limited to 'tools') diff --git a/tools/80indicator-debugging b/tools/80indicator-debugging new file mode 100644 index 0000000..afc2093 --- /dev/null +++ b/tools/80indicator-debugging @@ -0,0 +1,8 @@ +# 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 4b959a5..168cea8 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -21,6 +21,6 @@ indicator_loader_LDADD = \ xsessiondir = $(sysconfdir)/X11/Xsession.d -xsession_DATA = indicator-debugging +xsession_DATA = 80indicator-debugging EXTRA_DIST = $(xsession_DATA) diff --git a/tools/indicator-debugging b/tools/indicator-debugging deleted file mode 100644 index afc2093..0000000 --- a/tools/indicator-debugging +++ /dev/null @@ -1,8 +0,0 @@ -# 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 -- cgit v1.2.3 From b877951a5c45aaaa49718748b5f786681e3e9622 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 15 Oct 2010 12:41:16 -0500 Subject: Add mean comment --- tools/80indicator-debugging | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tools') diff --git a/tools/80indicator-debugging b/tools/80indicator-debugging index afc2093..f21559c 100644 --- a/tools/80indicator-debugging +++ b/tools/80indicator-debugging @@ -1,3 +1,9 @@ +# 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 -- cgit v1.2.3