[network-manager-applet/rm-userset] applet: rename nm_gconf_set_pre_keyring_callback()

[Dan Williams <dcbw src gnome org>]

commit 81526472e27305f7a18010c5edc894c15920dcc3
Author: Dan Williams <dcbw redhat com>
Date:   Thu Jan 13 21:55:06 2011 -0600

    applet: rename nm_gconf_set_pre_keyring_callback()

 src/applet.c                      |    4 ++--
 src/gconf-helpers/gconf-helpers.c |    4 ++--
 src/gconf-helpers/gconf-helpers.h |    3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/src/applet.c b/src/applet.c
index 20fe9f2..65f4230 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -2945,7 +2945,7 @@ constructor (GType type,
 
 	foo_client_setup (applet);
 
-	nm_gconf_set_pre_keyring_callback (applet_pre_keyring_callback, applet);
+	applet_set_pre_keyring_callback (applet_pre_keyring_callback, applet);
 
 	/* Track embedding to help debug issues where user has removed the
 	 * notification area applet from the panel, and thus nm-applet too.
@@ -2967,7 +2967,7 @@ static void finalize (GObject *object)
 {
 	NMApplet *applet = NM_APPLET (object);
 
-	nm_gconf_set_pre_keyring_callback (NULL, NULL);
+	applet_set_pre_keyring_callback (NULL, NULL);
 
 	g_slice_free (NMADeviceClass, applet->wired_class);
 	g_slice_free (NMADeviceClass, applet->wifi_class);
diff --git a/src/gconf-helpers/gconf-helpers.c b/src/gconf-helpers/gconf-helpers.c
index a2d7620..b0865e0 100644
--- a/src/gconf-helpers/gconf-helpers.c
+++ b/src/gconf-helpers/gconf-helpers.c
@@ -89,13 +89,13 @@ static gpointer pre_keyring_user_data = NULL;
 
 /* Sets a function to be called before each keyring access */
 void
-nm_gconf_set_pre_keyring_callback (PreKeyringCallback func, gpointer user_data)
+applet_set_pre_keyring_callback (PreKeyringCallback func, gpointer user_data)
 {
 	pre_keyring_cb = func;
 	pre_keyring_user_data = user_data;
 }
 
-void
+static void
 pre_keyring_callback (void)
 {
 	GnomeKeyringInfo *info = NULL;
diff --git a/src/gconf-helpers/gconf-helpers.h b/src/gconf-helpers/gconf-helpers.h
index 3297645..1710fa0 100644
--- a/src/gconf-helpers/gconf-helpers.h
+++ b/src/gconf-helpers/gconf-helpers.h
@@ -266,8 +266,7 @@ nm_gconf_add_keyring_item (const char *connection_uuid,
                            const char *secret);
 
 typedef void (*PreKeyringCallback) (gpointer user_data);
-void nm_gconf_set_pre_keyring_callback (PreKeyringCallback func, gpointer user_data);
-void pre_keyring_callback (void);
+void applet_set_pre_keyring_callback (PreKeyringCallback func, gpointer user_data);
 
 gboolean nm_gconf_get_ignore_ca_cert (const char *uuid, gboolean phase2);
 void nm_gconf_set_ignore_ca_cert (const char *uuid, gboolean phase2, gboolean ignore);