diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-08-17 02:10:02 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-08-17 02:10:02 +0800 |
| commit | a13609ba4d0271dc02f7b0552c6594c731925d5c (patch) | |
| tree | ff301601044c2774ef512fc8b929e9ca26340ecd /devel | |
| parent | 97da0da13c4108429012a50431be38b5680e1766 (diff) | |
| download | marcuscom-ports-a13609ba4d0271dc02f7b0552c6594c731925d5c.tar marcuscom-ports-a13609ba4d0271dc02f7b0552c6594c731925d5c.tar.gz marcuscom-ports-a13609ba4d0271dc02f7b0552c6594c731925d5c.tar.bz2 marcuscom-ports-a13609ba4d0271dc02f7b0552c6594c731925d5c.tar.lz marcuscom-ports-a13609ba4d0271dc02f7b0552c6594c731925d5c.tar.xz marcuscom-ports-a13609ba4d0271dc02f7b0552c6594c731925d5c.tar.zst marcuscom-ports-a13609ba4d0271dc02f7b0552c6594c731925d5c.zip | |
Clean up patch.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11296 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gconf2/files/patch-gconf_gconfd.c | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/devel/gconf2/files/patch-gconf_gconfd.c b/devel/gconf2/files/patch-gconf_gconfd.c index ef551cb28..31a6470a4 100644 --- a/devel/gconf2/files/patch-gconf_gconfd.c +++ b/devel/gconf2/files/patch-gconf_gconfd.c @@ -1,6 +1,6 @@ ---- gconf/gconfd.c.orig Fri May 5 12:40:23 2006 -+++ gconf/gconfd.c Fri May 5 12:41:43 2006 -@@ -124,12 +124,6 @@ +--- gconf/gconfd.c.orig 2008-05-10 08:34:31.000000000 -0400 ++++ gconf/gconfd.c 2008-08-16 14:08:05.000000000 -0400 +@@ -123,12 +123,6 @@ static void gconf_handle_segv (int signu static gboolean in_shutdown = FALSE; @@ -13,10 +13,11 @@ /* * CORBA goo */ -@@ -410,6 +404,18 @@ +@@ -408,6 +402,18 @@ gconf_server_load_sources(void) + } } - static void ++static void +reload_db (void) +{ + gconf_log (GCL_INFO, _("SIGHUP received, reloading all databases")); @@ -28,22 +29,20 @@ + logfile_read (); +} + -+static void - signal_handler (int signo) - { - static gint in_fatal = 0; -@@ -482,8 +488,8 @@ + /* + * Signal handlers should not log debug messages as this code is non-reentrant. + * Please avoid calling gconf_log in this function. +@@ -471,8 +477,7 @@ signal_handler (int signo) case SIGHUP: --in_fatal; - /* reload sources during next periodic_cleanup() */ - need_db_reload = TRUE; -+ /* reload sources immediately */ + reload_db (); break; #endif -@@ -864,18 +870,6 @@ +@@ -828,17 +833,6 @@ static gboolean need_log_cleanup = FALSE static gboolean periodic_cleanup_timeout(gpointer data) { @@ -58,7 +57,6 @@ - gconf_server_load_sources (); - logfile_read (); - } -- + gconf_log (GCL_DEBUG, "Performing periodic cleanup, expiring cache cruft"); - drop_old_clients (); |