diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2009-07-29 10:40:17 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2009-07-29 12:26:06 -0500 |
| commit | 1d8785f8bd83d8a33502c63a9d713e1da215fccd (patch) | |
| tree | 141a081cfd1d95c824a445c16aebb2569b8c4e65 /src/call-barring.c | |
| parent | 596eb5606e56639eaaf0a16e63736f8d2997adae (diff) | |
| download | ofono-1d8785f8bd83d8a33502c63a9d713e1da215fccd.tar.bz2 | |
Rename dbus_gsm_pending_reply
Diffstat (limited to 'src/call-barring.c')
| -rw-r--r-- | src/call-barring.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/call-barring.c b/src/call-barring.c index b67ca0ca..4ae758ae 100644 --- a/src/call-barring.c +++ b/src/call-barring.c @@ -278,7 +278,7 @@ static void generate_ss_query_reply(struct ofono_modem *modem) dbus_message_iter_close_container(&iter, &variant); - dbus_gsm_pending_reply(&cb->pending, reply); + __ofono_dbus_pending_reply(&cb->pending, reply); } static void cb_ss_query_next_lock_callback(const struct ofono_error *error, @@ -294,7 +294,7 @@ static void cb_ss_query_next_lock_callback(const struct ofono_error *error, cb->flags &= ~CALL_BARRING_FLAG_CACHED; - dbus_gsm_pending_reply(&cb->pending, + __ofono_dbus_pending_reply(&cb->pending, __ofono_error_failed(cb->pending)); return; } @@ -333,7 +333,7 @@ static void cb_ss_set_lock_callback(const struct ofono_error *error, if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { ofono_debug("Enabling/disabling Call Barring via SS failed"); - dbus_gsm_pending_reply(&cb->pending, + __ofono_dbus_pending_reply(&cb->pending, __ofono_error_failed(cb->pending)); return; } @@ -497,7 +497,7 @@ static void cb_set_passwd_callback(const struct ofono_error *error, void *data) ofono_debug("Changing Call Barring password via SS failed"); } - dbus_gsm_pending_reply(&cb->pending, reply); + __ofono_dbus_pending_reply(&cb->pending, reply); } static gboolean cb_ss_passwd(struct ofono_modem *modem, const char *sc, @@ -663,7 +663,7 @@ static void cb_get_properties_reply(struct ofono_modem *modem, int mask) dbus_message_iter_close_container(&iter, &dict); - dbus_gsm_pending_reply(&cb->pending, reply); + __ofono_dbus_pending_reply(&cb->pending, reply); } static void get_query_lock_callback(const struct ofono_error *error, @@ -736,7 +736,7 @@ static void set_query_lock_callback(const struct ofono_error *error, cb->flags &= ~CALL_BARRING_FLAG_CACHED; - dbus_gsm_pending_reply(&cb->pending, + __ofono_dbus_pending_reply(&cb->pending, __ofono_error_failed(cb->pending)); return; } @@ -749,7 +749,7 @@ static void set_query_lock_callback(const struct ofono_error *error, return; } - dbus_gsm_pending_reply(&cb->pending, + __ofono_dbus_pending_reply(&cb->pending, dbus_message_new_method_return(cb->pending)); update_barrings(modem, BEARER_CLASS_VOICE); } @@ -772,7 +772,7 @@ static void set_lock_callback(const struct ofono_error *error, void *data) if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { ofono_debug("Enabling/disabling a lock failed"); - dbus_gsm_pending_reply(&cb->pending, + __ofono_dbus_pending_reply(&cb->pending, __ofono_error_failed(cb->pending)); return; } @@ -921,7 +921,7 @@ static void disable_all_callback(const struct ofono_error *error, void *data) if (error->type != OFONO_ERROR_TYPE_NO_ERROR) { ofono_debug("Disabling all barring failed"); - dbus_gsm_pending_reply(&cb->pending, + __ofono_dbus_pending_reply(&cb->pending, __ofono_error_failed(cb->pending)); return; } |