From 4c4c5ef10763f880bdabb4c14ea1b57d6989bb57 Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Tue, 12 Jul 2011 09:34:36 -0500
Subject: connman: Perform more renaming

---
 plugins/connman.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/connman.c b/plugins/connman.c
index 930b6ad1..9fdd3214 100644
--- a/plugins/connman.c
+++ b/plugins/connman.c
@@ -46,7 +46,7 @@ static DBusConnection *connection;
 static GHashTable *requests;
 static unsigned int id;
 
-struct pns_req {
+struct connman_req {
 	int uid;
 	DBusPendingCall *pending;
 	ofono_private_network_cb_t cb;
@@ -73,9 +73,9 @@ static void send_release(const char *path)
 	dbus_message_unref(message);
 }
 
-static void pns_release(int uid)
+static void connman_release(int uid)
 {
-	struct pns_req *req;
+	struct connman_req *req;
 
 	DBG("");
 
@@ -100,7 +100,7 @@ static void pns_release(int uid)
 
 static void request_reply(DBusPendingCall *call, void *user_data)
 {
-	struct pns_req *req = user_data;
+	struct connman_req *req = user_data;
 	struct ofono_private_network_settings pns;
 	DBusMessageIter array, dict, entry;
 	DBusMessage *reply;
@@ -197,7 +197,7 @@ static void request_reply(DBusPendingCall *call, void *user_data)
 	return;
 
 release:
-	pns_release(req->uid);
+	connman_release(req->uid);
 error:
 	if (pns.fd >= 0)
 		close(pns.fd);
@@ -211,15 +211,15 @@ error:
 	dbus_pending_call_unref(call);
 }
 
-static int pns_request(ofono_private_network_cb_t cb, void *data)
+static int connman_request(ofono_private_network_cb_t cb, void *data)
 {
 	DBusMessage *message;
 	DBusPendingCall *call;
-	struct pns_req *req;
+	struct connman_req *req;
 
 	DBG("");
 
-	req = g_try_new(struct pns_req, 1);
+	req = g_try_new(struct connman_req, 1);
 
 	if (req == NULL)
 		return -ENOMEM;
@@ -257,13 +257,13 @@ static int pns_request(ofono_private_network_cb_t cb, void *data)
 
 static struct ofono_private_network_driver pn_driver = {
 	.name		= "ConnMan Private Network",
-	.request	= pns_request,
-	.release	= pns_release,
+	.request	= connman_request,
+	.release	= connman_release,
 };
 
 static void request_free(gpointer user_data)
 {
-	struct pns_req *req = user_data;
+	struct connman_req *req = user_data;
 
 	g_free(req->path);
 	g_free(req);
-- 
cgit v1.2.3