[gconf/port-to-dbus: 6/23] gconfd: Export gconfd_obtain_database

[Ross Burton <rburton src gnome org>]

commit 2bc15c35f34bfeb5cf5f230bd2e6a5cc8908b799
Author: Rob Bradford <rob linux intel com>
Date:   Thu Jun 16 12:26:11 2011 +0100

    gconfd: Export gconfd_obtain_database

 gconf/gconfd.c |   14 ++++++--------
 gconf/gconfd.h |    3 +++
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index ecdc167..1c5fae2 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -143,8 +143,6 @@ static void                 set_default_database (GConfDatabase* db);
 static void                 register_database (GConfDatabase* db);
 static void                 unregister_database (GConfDatabase* db);
 static GConfDatabase*       lookup_database (GSList *addresses);
-static GConfDatabase*       obtain_database (GSList *addresses,
-                                             GError **err);
 static void                 drop_old_databases (void);
 static gboolean             no_databases_in_use (void);
 
@@ -255,7 +253,7 @@ gconfd_get_database(PortableServer_Servant servant,
     return CORBA_OBJECT_NIL;
   
   addresses = g_slist_append (NULL, (char *) address);
-  db = obtain_database (addresses, &error);
+  db = gconfd_obtain_database (addresses, &error);
   g_slist_free (addresses);
 
   if (db != NULL)
@@ -283,7 +281,7 @@ gconfd_get_database_for_addresses (PortableServer_Servant           servant,
   while (i < seq->_length)
     addresses = g_slist_append (addresses, seq->_buffer [i++]);
 
-  db = obtain_database (addresses, &error);
+  db = gconfd_obtain_database (addresses, &error);
 
   g_slist_free (addresses);
 
@@ -1156,9 +1154,9 @@ lookup_database (GSList *addresses)
   return retval;
 }
 
-static GConfDatabase*
-obtain_database (GSList  *addresses,
-                 GError **err)
+GConfDatabase *
+gconfd_obtain_database (GSList  *addresses,
+                        GError **err)
 {
   GConfSources* sources;
   GError* error = NULL;
@@ -2211,7 +2209,7 @@ listener_logentry_restore_and_destroy_foreach (gpointer key,
 
       addresses = gconf_persistent_name_get_address_list (lle->address);
 
-      db = obtain_database (addresses, NULL);
+      db = gconfd_obtain_database (addresses, NULL);
 
       gconf_address_list_free (addresses);
     }
diff --git a/gconf/gconfd.h b/gconf/gconfd.h
index 6d857b4..0f09843 100644
--- a/gconf/gconfd.h
+++ b/gconf/gconfd.h
@@ -52,6 +52,9 @@ gconfd_clear_cache_for_sources (GConfSources *sources);
 void gconfd_need_log_cleanup (void);
 void gconfd_main_quit        (void);
 
+GConfDatabase* gconfd_obtain_database (GSList  *addresses,
+                                       GError **err);
+
 G_END_DECLS
 
 #endif