diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2011-12-29 11:37:52 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-15 14:14:40 +0100 |
| commit | 7b506bc8a6931568edc97b444e64e620b13c671b (patch) | |
| tree | f39bb058806daddcbce544f45ca67abf1f2dfa0d /src | |
| parent | 08b7620b7ab690c2b8f63247452b18adce7ae704 (diff) | |
iface-modem: renamed `modem_flow_control' to `setup_flow_control'
Changed broadband modem and Cinterion plugin accordingly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-broadband-modem.c | 12 | ||||
| -rw-r--r-- | src/mm-iface-modem.c | 10 | ||||
| -rw-r--r-- | src/mm-iface-modem.h | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c index d9c2c498..54f38b73 100644 --- a/src/mm-broadband-modem.c +++ b/src/mm-broadband-modem.c @@ -1074,7 +1074,7 @@ load_supported_charsets (MMIfaceModem *self, /* FLOW CONTROL */ static gboolean -modem_flow_control_finish (MMIfaceModem *self, +setup_flow_control_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { @@ -1083,7 +1083,7 @@ modem_flow_control_finish (MMIfaceModem *self, } static void -modem_flow_control (MMIfaceModem *self, +setup_flow_control (MMIfaceModem *self, GAsyncReadyCallback callback, gpointer user_data) { @@ -1097,7 +1097,7 @@ modem_flow_control (MMIfaceModem *self, result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - modem_flow_control); + setup_flow_control); g_simple_async_result_set_op_res_gboolean (result, TRUE); g_simple_async_result_complete_in_idle (result); g_object_unref (result); @@ -1131,7 +1131,7 @@ modem_power_up (MMIfaceModem *self, result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - modem_flow_control); + setup_flow_control); g_simple_async_result_set_op_res_gboolean (result, TRUE); g_simple_async_result_complete_in_idle (result); g_object_unref (result); @@ -2959,8 +2959,8 @@ iface_modem_init (MMIfaceModem *iface) iface->modem_init_finish = modem_init_finish; iface->modem_power_up = modem_power_up; iface->modem_power_up_finish = modem_power_up_finish; - iface->modem_flow_control = modem_flow_control; - iface->modem_flow_control_finish = modem_flow_control_finish; + iface->setup_flow_control = setup_flow_control; + iface->setup_flow_control_finish = setup_flow_control_finish; iface->load_supported_charsets = load_supported_charsets; iface->load_supported_charsets_finish = load_supported_charsets_finish; iface->modem_charset = modem_charset; diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c index 8af6a6cc..79590a1c 100644 --- a/src/mm-iface-modem.c +++ b/src/mm-iface-modem.c @@ -1646,7 +1646,7 @@ mm_iface_modem_enable_finish (MMIfaceModem *self, VOID_REPLY_READY_FN (modem_init); VOID_REPLY_READY_FN (modem_power_up); VOID_REPLY_READY_FN (modem_after_power_up); -VOID_REPLY_READY_FN (modem_flow_control); +VOID_REPLY_READY_FN (setup_flow_control); static void load_supported_charsets_ready (MMIfaceModem *self, @@ -1783,11 +1783,11 @@ interface_enabling_step (EnablingContext *ctx) ctx->step++; case ENABLING_STEP_FLOW_CONTROL: - if (MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->modem_flow_control && - MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->modem_flow_control_finish) { - MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->modem_flow_control ( + if (MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->setup_flow_control && + MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->setup_flow_control_finish) { + MM_IFACE_MODEM_GET_INTERFACE (ctx->self)->setup_flow_control ( ctx->self, - (GAsyncReadyCallback)modem_flow_control_ready, + (GAsyncReadyCallback)setup_flow_control_ready, ctx); return; } diff --git a/src/mm-iface-modem.h b/src/mm-iface-modem.h index 944fba84..bf7bc096 100644 --- a/src/mm-iface-modem.h +++ b/src/mm-iface-modem.h @@ -197,10 +197,10 @@ struct _MMIfaceModem { GError **error); /* Asynchronous flow control setup */ - void (*modem_flow_control) (MMIfaceModem *self, + void (*setup_flow_control) (MMIfaceModem *self, GAsyncReadyCallback callback, gpointer user_data); - gboolean (*modem_flow_control_finish) (MMIfaceModem *self, + gboolean (*setup_flow_control_finish) (MMIfaceModem *self, GAsyncResult *res, GError **error); |