Fix a few things

6 files changed, 18 insertions, 17 deletions

diff --git a/backends/markup-tree.c b/backends/markup-tree.c
index 98209e10..6a329861 100644
--- a/backends/markup-tree.c
+++ b/backends/markup-tree.c
@@ -31,6 +31,7 @@
 #include <dirent.h>
 #include <limits.h>
 #include <time.h>
+#include <stdio.h>
 
 typedef struct
 {
diff --git a/doc/gconf/tmpl/gconf-internals.sgml b/doc/gconf/tmpl/gconf-internals.sgml
index 9189b2a7..951c5514 100644
--- a/doc/gconf/tmpl/gconf-internals.sgml
+++ b/doc/gconf/tmpl/gconf-internals.sgml
@@ -332,16 +332,6 @@ This function does not work. Don't use it.
 @setting: 
 
 
-<!-- ##### FUNCTION gconf_handle_oaf_exception ##### -->
-<para>
-
-</para>
-
-@ev: 
-@err: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gconf_engine_get_full ##### -->
 <para>
 This function is basically for internal use.
diff --git a/doc/gconf/tmpl/gconf-unused.sgml b/doc/gconf/tmpl/gconf-unused.sgml
index a5d0da18..8d8ff07d 100644
--- a/doc/gconf/tmpl/gconf-unused.sgml
+++ b/doc/gconf/tmpl/gconf-unused.sgml
@@ -152,6 +152,15 @@ Returns the ORB GConf is using.
 
 @Returns: the ORB GConf is using.
 
+<!-- ##### FUNCTION gconf_handle_oaf_exception ##### -->
+<para>
+
+</para>
+
+@ev: 
+@err: 
+@Returns: 
+
 <!-- ##### FUNCTION gconf_init_orb ##### -->
 <para>
 Initializes CORBA and a connection to the ORB, sets up authentication, 
diff --git a/gconf/gconf-database-corba.c b/gconf/gconf-database-corba.c
index b9afe60c..9b012468 100644
--- a/gconf/gconf-database-corba.c
+++ b/gconf/gconf-database-corba.c
@@ -1063,7 +1063,7 @@ client_alive_predicate (const gchar* location,
   CORBA_boolean result;
 
   if (l->parent.type != GCONF_DATABASE_LISTENER_CORBA)
-    return TRUE;
+    return FALSE;
   
   CORBA_exception_init (&ev);
   
diff --git a/gconf/gconfd-dbus.c b/gconf/gconfd-dbus.c
index 8fce617f..bb4a2881 100644
--- a/gconf/gconfd-dbus.c
+++ b/gconf/gconfd-dbus.c
@@ -986,14 +986,14 @@ remove_listener_predicate (const gchar* location,
   const char *name = user_data;
   
   if (l->parent.type != GCONF_DATABASE_LISTENER_DBUS)
-    return TRUE;
+    return FALSE;
 
   if (strcmp (l->who, name) == 0)
     {
-      return FALSE;
+      return TRUE;
     }
   else
-    return TRUE;
+    return FALSE;
 }
 
 static void
@@ -1292,7 +1292,6 @@ gconf_database_dbus_notify_listeners (GConfDatabase    *db,
   closure.is_writable = is_writable;
 
   gconf_listeners_notify (db->listeners, key, notify_listeners_cb, &closure);
-  
 }
 
 /*
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index 7a63070e..995b648f 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -763,15 +763,17 @@ drop_old_databases(void)
 
 #ifdef HAVE_ORBIT
   gconf_database_corba_drop_dead_listeners (default_db);
+#endif
   
   tmp_list = db_list;
   while (tmp_list)
     {
       GConfDatabase* db = tmp_list->data;
 
+#ifdef HAVE_ORBIT
       /* Drop any listeners whose clients are gone. */
       gconf_database_corba_drop_dead_listeners (db);
-      
+#endif
       if (db->listeners &&                             /* not already hibernating */
           gconf_listeners_count(db->listeners) == 0 && /* Can hibernate */
           (now - db->last_access) > (60*20))           /* 20 minutes without access */
@@ -781,7 +783,7 @@ drop_old_databases(void)
       
       tmp_list = g_list_next (tmp_list);
     }
-#endif
+
   
   tmp_list = dead;
   while (tmp_list)