configure.in | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

libgamin/gam_data.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix build failure on gnu/kfreebsd
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=588337
Bug-Debian: http://bugs.debian.org/434141

configure.in | 14 8 + 6 - 0 !
1 file changed, 8 insertions(+), 6 deletions(-)

 enable linux features on armel
Bug: http://bugzilla.gnome.org/show_bug.cgi?id=588338
Bug-Debian: http://bugs.debian.org/459936

server/gam_node.c | 2 1 + 1 - 0 !
server/gam_node.h | 2 1 + 1 - 0 !
server/gam_subscription.c | 2 1 + 1 - 0 !
server/gam_subscription.h | 2 1 + 1 - 0 !
4 files changed, 4 insertions(+), 4 deletions(-)

 don't use deprecated g_const_return. fixes building with newer glib versions.

server/inotify-helper.c | 7 2 + 5 - 0 !
server/inotify-helper.h | 1 0 + 1 - 0 !
2 files changed, 2 insertions(+), 6 deletions(-)

 [patch] fix possible server deadlock in ih_sub_cancel

ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
However, ih_sub_cancel() locks it again, and locking GMutex recursively
causes undefined behaviour.

Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
is its only user. Also make the function static so that it won't
accidentally get used by other files without locking (inotify-helper.h
is an internal server header).

This should fix the intermittent deadlocks I've been experiencing
causing KDE applications to no longer start, and probably also
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361