diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-01-10 05:22:13 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-01-10 05:22:13 +0000 |
| commit | 610ae5681637c1051a0c17b54e29d97f53da2f3a (patch) | |
| tree | c231a1eb74b07e444fa7363012cb84bf23d83ce0 /devel/gconf2/files/patch-gconf_gconfd.c | |
| parent | Add a new framework for browser plugins, USE_WEBPLUGINS. It is for which foo (diff) | |
Presenting GNOME 2.24 for FreeBSD.
See http://library.gnome.org/misc/release-notes/2.24/ for the general
release notes. On the FreeBSD front, this release introduces Fuse support
in HAL, adds multi-CPU support to libgtop, WebKit updates, and fixes some
long-standing seahorse and gnome-keyring bugs. The documentation updates
to the website are forthcoming.
This release features commits by adamw, ahze, kwm, mezz, and myself. It would
not have been possible without are contributors and testers:
Alexander Loginov
Craig Butler [1]
Dmitry Marakasov [6]
Eric L. Chen
Joseph S. Atkinson
Kris Moore
Lapo Luchini [7]
Nikos Ntarmos
Pawel Worach
Romain Tartiere
TAOKA Fumiyoshi [3]
Yasuda Keisuke
Zyl
aZ [4]
bf [2] [5]
Florent Thoumie
Peter Wemm
pluknet
PR: 125857 [1]
126993 [2]
130031 [3]
127399 [4]
127661 [5]
124302 [6]
129570 [7]
129936
123790
Notes
Notes:
svn path=/head/; revision=225629
Diffstat (limited to 'devel/gconf2/files/patch-gconf_gconfd.c')
| -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 ef551cb28e81..31a6470a42e5 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 (); |