Merged trunk changes r9797:9829 into 217update branch.
diff -urN GConf-2.16.0/gconf/gconfd.c GConf-2.16.0-hacked/gconf/gconfd.c
--- GConf-2.16.0/gconf/gconfd.c 2006-08-11 02:34:05.000000000 +1200
+++ GConf-2.16.0-hacked/gconf/gconfd.c 2006-10-23 21:04:36.304528000 +1300
@@ -455,10 +455,7 @@
/* let the fatal signals interrupt us */
--in_fatal;
- gconf_log (GCL_ERR,
- _("Received signal %d, shutting down abnormally. Please file a GConf bug report."),
- signo);
-
+ /* Removed any call to gconf_log() as it is not reentrant */
if (gconf_main_is_running ())
gconf_main_quit ();
@@ -471,8 +468,7 @@
/* let the fatal signals interrupt us */
--in_fatal;
- gconf_log (GCL_INFO,
- _("Received signal %d, shutting down cleanly"), signo);
+ /* Removed any call to gconf_log() as it is not reentrant */
if (gconf_main_is_running ())
gconf_main_quit ();