aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-01-28 21:03:42 -0800
committerTed Gould <ted@gould.cx>2010-01-28 21:03:42 -0800
commit138321d54c11376cabd40d8fb211941508ad5778 (patch)
tree4039ae2c11582d321189f5087051429f548c5fe4
parentf5232a315c253f98b08aee7bb3ec4e5613340c6b (diff)
downloadlibayatana-indicator-138321d54c11376cabd40d8fb211941508ad5778.tar.gz
libayatana-indicator-138321d54c11376cabd40d8fb211941508ad5778.tar.bz2
libayatana-indicator-138321d54c11376cabd40d8fb211941508ad5778.zip
In the timeout function mention that we're shutting down, and have an environment variable to stop that.
-rw-r--r--libindicator/indicator-service.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/libindicator/indicator-service.c b/libindicator/indicator-service.c
index e2ec6b2..ccb56d5 100644
--- a/libindicator/indicator-service.c
+++ b/libindicator/indicator-service.c
@@ -316,7 +316,12 @@ get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspe
static gboolean
timeout_no_watchers (gpointer data)
{
- g_signal_emit(G_OBJECT(data), signals[SHUTDOWN], 0, TRUE);
+ g_warning("No watchers, service timing out.");
+ if (g_getenv("INDICATOR_ALLOW_NO_WATCHERS") == NULL) {
+ g_signal_emit(G_OBJECT(data), signals[SHUTDOWN], 0, TRUE);
+ } else {
+ g_warning("\tblocked by environment variable.");
+ }
return FALSE;
}