diff options
| author | Havoc Pennington <hp@pobox.com> | 2002-03-24 01:50:57 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2002-03-24 01:50:57 +0000 |
| commit | 67956f40925120b1b3817f432f1be9fbc2e63948 (patch) | |
| tree | 85898cb6063b144bcecb3936042d6a84eee93dfa | |
| parent | 4e29fce14a843bc12921843fb8d189430c4d7084 (diff) | |
| download | gconf-67956f40925120b1b3817f432f1be9fbc2e63948.tar.gz | |
change exit timeout to 2 minutes
2002-03-23 Havoc Pennington <hp@pobox.com>
* gconf/gconfd.c (gconf_main): change exit timeout to 2 minutes
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | gconf/gconfd.c | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2002-03-23 Havoc Pennington <hp@pobox.com> + + * gconf/gconfd.c (gconf_main): change exit timeout to 2 minutes + 2002-03-14 Havoc Pennington <hp@redhat.com> * configure.in: 1.0.9 diff --git a/gconf/gconfd.c b/gconf/gconfd.c index bf8cca13..806d0027 100644 --- a/gconf/gconfd.c +++ b/gconf/gconfd.c @@ -724,11 +724,7 @@ gconf_main(void) if (main_loops == NULL) { -#ifdef GCONF_ENABLE_DEBUG - gulong timeout_len = 1000*60*1; /* 1 sec * 60 s/min * 1 min */ -#else - gulong timeout_len = 1000*60*15; /* 1 sec * 60 s/min * 2 min */ -#endif + gulong timeout_len = 1000*60*2; /* 1 sec * 60 s/min * 2 min */ g_assert(timeout_id == 0); timeout_id = g_timeout_add (timeout_len, |