From 69ea6cd7a0516d59307b1fb511ffeab77b8b8b81 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Thu, 29 Jul 2010 23:50:20 -0500 Subject: [PATCH] stkagent: Remove stk_agent_generic_cb --- src/stkagent.c | 4 ++-- src/stkagent.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/stkagent.c b/src/stkagent.c index 5965859c..18c4fc04 100644 --- a/src/stkagent.c +++ b/src/stkagent.c @@ -356,7 +356,7 @@ int stk_agent_request_selection(struct stk_agent *agent, static void display_text_cb(DBusPendingCall *call, void *data) { struct stk_agent *agent = data; - stk_agent_generic_cb cb = agent->user_cb; + stk_agent_display_text_cb cb = agent->user_cb; DBusMessage *reply = dbus_pending_call_steal_reply(call); enum stk_agent_result result; gboolean remove_agent; @@ -392,7 +392,7 @@ error: int stk_agent_display_text(struct stk_agent *agent, const char *text, uint8_t icon_id, ofono_bool_t urgent, - ofono_bool_t ack, stk_agent_generic_cb cb, + ofono_bool_t ack, stk_agent_display_text_cb cb, void *user_data, int timeout) { DBusConnection *conn = ofono_dbus_get_connection(); diff --git a/src/stkagent.h b/src/stkagent.h index 9f5a8204..0ed056a7 100644 --- a/src/stkagent.h +++ b/src/stkagent.h @@ -45,8 +45,8 @@ struct stk_menu { gboolean has_help; }; -typedef void (*stk_agent_generic_cb)(enum stk_agent_result result, - void *user_data); +typedef void (*stk_agent_display_text_cb)(enum stk_agent_result result, + void *user_data); typedef void (*stk_agent_selection_cb)(enum stk_agent_result result, uint8_t id, void *user_data); @@ -73,7 +73,7 @@ int stk_agent_request_selection(struct stk_agent *agent, int stk_agent_display_text(struct stk_agent *agent, const char *text, uint8_t icon_id, ofono_bool_t urgent, - ofono_bool_t ack, stk_agent_generic_cb cb, + ofono_bool_t ack, stk_agent_display_text_cb cb, void *user_data, int timeout); void append_menu_items_variant(DBusMessageIter *iter,