mirror of git://git.sysmocom.de/ofono
stkagent: Remove stk_agent_generic_cb
This commit is contained in:
parent
0c0f362ec3
commit
69ea6cd7a0
|
@ -356,7 +356,7 @@ int stk_agent_request_selection(struct stk_agent *agent,
|
||||||
static void display_text_cb(DBusPendingCall *call, void *data)
|
static void display_text_cb(DBusPendingCall *call, void *data)
|
||||||
{
|
{
|
||||||
struct stk_agent *agent = 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);
|
DBusMessage *reply = dbus_pending_call_steal_reply(call);
|
||||||
enum stk_agent_result result;
|
enum stk_agent_result result;
|
||||||
gboolean remove_agent;
|
gboolean remove_agent;
|
||||||
|
@ -392,7 +392,7 @@ error:
|
||||||
|
|
||||||
int stk_agent_display_text(struct stk_agent *agent, const char *text,
|
int stk_agent_display_text(struct stk_agent *agent, const char *text,
|
||||||
uint8_t icon_id, ofono_bool_t urgent,
|
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 *user_data, int timeout)
|
||||||
{
|
{
|
||||||
DBusConnection *conn = ofono_dbus_get_connection();
|
DBusConnection *conn = ofono_dbus_get_connection();
|
||||||
|
|
|
@ -45,8 +45,8 @@ struct stk_menu {
|
||||||
gboolean has_help;
|
gboolean has_help;
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef void (*stk_agent_generic_cb)(enum stk_agent_result result,
|
typedef void (*stk_agent_display_text_cb)(enum stk_agent_result result,
|
||||||
void *user_data);
|
void *user_data);
|
||||||
|
|
||||||
typedef void (*stk_agent_selection_cb)(enum stk_agent_result result,
|
typedef void (*stk_agent_selection_cb)(enum stk_agent_result result,
|
||||||
uint8_t id, void *user_data);
|
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,
|
int stk_agent_display_text(struct stk_agent *agent, const char *text,
|
||||||
uint8_t icon_id, ofono_bool_t urgent,
|
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 *user_data, int timeout);
|
||||||
|
|
||||||
void append_menu_items_variant(DBusMessageIter *iter,
|
void append_menu_items_variant(DBusMessageIter *iter,
|
||||||
|
|
Loading…
Reference in New Issue