stkagent: Rename stk_agent_remove

to stk_agent_free

3 files changed, 9 insertions, 9 deletions

diff --git a/src/stk.c b/src/stk.c
index a09cfb00..bc51de61 100644
--- a/src/stk.c
+++ b/src/stk.c
@@ -430,7 +430,7 @@ static gboolean session_agent_remove_cb(gpointer user_data)
 
 	stk->remove_agent_source = 0;
 
-	stk_agent_remove(stk->session_agent);
+	stk_agent_free(stk->session_agent);
 
 	return FALSE;
 }
@@ -493,7 +493,7 @@ static DBusMessage *stk_unregister_agent(DBusConnection *conn,
 	if (!stk_agent_matches(stk->default_agent, agent_path, agent_bus))
 		return __ofono_error_failed(msg);
 
-	stk_agent_remove(stk->default_agent);
+	stk_agent_free(stk->default_agent);
 
 	return dbus_message_new_method_return(msg);
 }
@@ -1087,7 +1087,7 @@ void ofono_stk_proactive_session_end_notify(struct ofono_stk *stk)
 	stk_proactive_command_cancel(stk);
 
 	if (stk->session_agent)
-		stk_agent_remove(stk->session_agent);
+		stk_agent_free(stk->session_agent);
 }
 
 void ofono_stk_proactive_command_notify(struct ofono_stk *stk,
@@ -1212,10 +1212,10 @@ static void stk_unregister(struct ofono_atom *atom)
 	const char *path = __ofono_atom_get_path(atom);
 
 	if (stk->session_agent)
-		stk_agent_remove(stk->session_agent);
+		stk_agent_free(stk->session_agent);
 
 	if (stk->default_agent)
-		stk_agent_remove(stk->default_agent);
+		stk_agent_free(stk->default_agent);
 
 	if (stk->pending_cmd) {
 		stk_command_free(stk->pending_cmd);
diff --git a/src/stkagent.c b/src/stkagent.c
index 7072e904..c5eab478 100644
--- a/src/stkagent.c
+++ b/src/stkagent.c
@@ -134,7 +134,7 @@ static void stk_agent_request_terminate(struct stk_agent *agent)
 	stk_agent_request_end(agent);
 }
 
-void stk_agent_remove(struct stk_agent *agent)
+void stk_agent_free(struct stk_agent *agent)
 {
 	DBusConnection *conn = ofono_dbus_get_connection();
 
@@ -205,7 +205,7 @@ static void stk_agent_request_reply_handle(DBusPendingCall *call, void *data)
 	if (agent->is_default)
 		return;
 
-	stk_agent_remove(agent);
+	stk_agent_free(agent);
 }
 
 static gboolean stk_agent_request_send(gpointer user_data)
@@ -277,7 +277,7 @@ static void stk_agent_disconnect_cb(DBusConnection *conn, void *user_data)
 
 	agent->disconnect_watch = 0;
 
-	stk_agent_remove(user_data);
+	stk_agent_free(user_data);
 }
 
 struct stk_agent *stk_agent_new(const char *path, const char *sender,
diff --git a/src/stkagent.h b/src/stkagent.h
index 26328ea1..6414ba5e 100644
--- a/src/stkagent.h
+++ b/src/stkagent.h
@@ -54,7 +54,7 @@ typedef void (*stk_agent_selection_cb)(enum stk_agent_result result,
 struct stk_agent *stk_agent_new(const char *path, const char *sender,
 					ofono_bool_t is_default);
 
-void stk_agent_remove(struct stk_agent *agent);
+void stk_agent_free(struct stk_agent *agent);
 
 ofono_bool_t stk_agent_busy(struct stk_agent *agent);
 ofono_bool_t stk_agent_matches(struct stk_agent *agent,