[gconf/port-to-dbus: 3/23] gconf-internals: Internalise gconf_get_lock_or_current_holder function

[Ross Burton <rburton src gnome org>]

commit 0630a9a047bf235b3518a5a1c1ace4b938088c84
Author: Rob Bradford <rob linux intel com>
Date:   Wed Jun 15 18:02:47 2011 +0100

    gconf-internals: Internalise gconf_get_lock_or_current_holder function
    
    This is only used by gconf_get_lock and so need not be exposed.

 gconf/gconf-internals.c |    2 +-
 gconf/gconf-internals.h |    4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c
index 6bc16e2..ed42ca6 100644
--- a/gconf/gconf-internals.c
+++ b/gconf/gconf-internals.c
@@ -2526,7 +2526,7 @@ gconf_get_server (gboolean  start_if_not_found,
   return server;
 }
 
-GConfLock*
+static GConfLock *
 gconf_get_lock_or_current_holder (const gchar  *lock_directory,
                                   ConfigServer *current_server,
                                   GError      **err)
diff --git a/gconf/gconf-internals.h b/gconf/gconf-internals.h
index ccb4ca5..b9cbaf0 100644
--- a/gconf/gconf-internals.h
+++ b/gconf/gconf-internals.h
@@ -217,10 +217,6 @@ GConfLock* gconf_get_lock     (const gchar  *lock_directory,
                                GError      **err);
 gboolean   gconf_release_lock (GConfLock    *lock,
                                GError      **err);
-GConfLock* gconf_get_lock_or_current_holder (const gchar  *lock_directory,
-                                             ConfigServer *current_server,
-                                             GError      **err);
-
 GError*  gconf_error_new  (GConfError en,
                            const gchar* format, ...) G_GNUC_PRINTF (2, 3);