patches/GConf-02-daemon-hanged-solaris.diff
author dcarbery
Fri, 24 Nov 2006 16:37:59 +0000
branch217update
changeset 19096 d542fc2c823e
parent 8400 432831637a10
child 11156 0e87f072db5a
permissions -rw-r--r--
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 ();