diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2013-05-29 13:42:14 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2013-06-05 19:15:14 +0200 |
| commit | 1c67d050cb0451a63c8fdb0bd673892bdc04e4e0 (patch) | |
| tree | 71c2ed691263c4b8afbdc021fc1ea3f17d7b9441 /plugins/huawei | |
| parent | 45ceba76924f184ed9e12ba3d35e00a55ad3a197 (diff) | |
api,introspection: merge 'AllowedModes' and 'SupportedMode' into 'CurrentModes'
We now have a single 'CurrentModes' property which contains both values in a
tuple with signature "(uu)".
Also, rename 'SetAllowedModes()' to 'SetCurrentModes()', and update the list of
arguments expected to have a single "(uu)" tuple.
Diffstat (limited to 'plugins/huawei')
| -rw-r--r-- | plugins/huawei/mm-broadband-modem-huawei.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c index 410032df..eb13a1ba 100644 --- a/plugins/huawei/mm-broadband-modem-huawei.c +++ b/plugins/huawei/mm-broadband-modem-huawei.c @@ -1187,7 +1187,7 @@ parse_prefmode (const gchar *response, MMModemMode *preferred, GError **error) } static gboolean -load_allowed_modes_finish (MMIfaceModem *self, +load_current_modes_finish (MMIfaceModem *self, GAsyncResult *res, MMModemMode *allowed, MMModemMode *preferred, @@ -1208,7 +1208,7 @@ load_allowed_modes_finish (MMIfaceModem *self, } static void -load_allowed_modes (MMIfaceModem *self, +load_current_modes (MMIfaceModem *self, GAsyncReadyCallback callback, gpointer user_data) { @@ -1226,7 +1226,7 @@ load_allowed_modes (MMIfaceModem *self, } /*****************************************************************************/ -/* Set allowed modes (Modem interface) */ +/* Set current modes (Modem interface) */ static gboolean allowed_mode_to_prefmode (MMModemMode allowed, guint *huawei_mode, GError **error) @@ -1256,7 +1256,7 @@ allowed_mode_to_prefmode (MMModemMode allowed, guint *huawei_mode, GError **erro } static gboolean -set_allowed_modes_finish (MMIfaceModem *self, +set_current_modes_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { @@ -1281,7 +1281,7 @@ allowed_mode_update_ready (MMBroadbandModemHuawei *self, } static void -set_allowed_modes (MMIfaceModem *self, +set_current_modes (MMIfaceModem *self, MMModemMode allowed, MMModemMode preferred, GAsyncReadyCallback callback, @@ -1296,7 +1296,7 @@ set_allowed_modes (MMIfaceModem *self, result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - set_allowed_modes); + set_current_modes); if (mm_iface_modem_is_cdma_only (self)) { if (allowed_mode_to_prefmode (allowed, &mode, &error)) @@ -2743,10 +2743,10 @@ iface_modem_init (MMIfaceModem *iface) iface->set_current_bands_finish = set_current_bands_finish; iface->load_supported_modes = load_supported_modes; iface->load_supported_modes_finish = load_supported_modes_finish; - iface->load_allowed_modes = load_allowed_modes; - iface->load_allowed_modes_finish = load_allowed_modes_finish; - iface->set_allowed_modes = set_allowed_modes; - iface->set_allowed_modes_finish = set_allowed_modes_finish; + iface->load_current_modes = load_current_modes; + iface->load_current_modes_finish = load_current_modes_finish; + iface->set_current_modes = set_current_modes; + iface->set_current_modes_finish = set_current_modes_finish; iface->load_signal_quality = modem_load_signal_quality; iface->load_signal_quality_finish = modem_load_signal_quality_finish; iface->create_bearer = huawei_modem_create_bearer; |