sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

stkagent: Remove stk_agent_generic_cb

This commit is contained in:
Denis Kenzior 2010-07-29 23:50:20 -05:00
parent 0c0f362ec3
commit 69ea6cd7a0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/stkagent.c
View File

@ -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();

6
src/stkagent.h
View File

@ -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,