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/icera | |
| 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/icera')
| -rw-r--r-- | plugins/icera/mm-broadband-modem-icera.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/icera/mm-broadband-modem-icera.c b/plugins/icera/mm-broadband-modem-icera.c index a9fdfe38..84e998b7 100644 --- a/plugins/icera/mm-broadband-modem-icera.c +++ b/plugins/icera/mm-broadband-modem-icera.c @@ -153,7 +153,7 @@ load_supported_modes (MMIfaceModem *self, /* Load initial allowed/preferred modes (Modem interface) */ static gboolean -modem_load_allowed_modes_finish (MMIfaceModem *self, +modem_load_current_modes_finish (MMIfaceModem *self, GAsyncResult *res, MMModemMode *allowed, MMModemMode *preferred, @@ -212,7 +212,7 @@ modem_load_allowed_modes_finish (MMIfaceModem *self, } static void -modem_load_allowed_modes (MMIfaceModem *self, +modem_load_current_modes (MMIfaceModem *self, GAsyncReadyCallback callback, gpointer user_data) { @@ -228,7 +228,7 @@ modem_load_allowed_modes (MMIfaceModem *self, /* Set allowed modes (Modem interface) */ static gboolean -modem_set_allowed_modes_finish (MMIfaceModem *self, +modem_set_current_modes_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { @@ -253,7 +253,7 @@ allowed_mode_update_ready (MMBaseModem *self, } static void -modem_set_allowed_modes (MMIfaceModem *self, +modem_set_current_modes (MMIfaceModem *self, MMModemMode allowed, MMModemMode preferred, GAsyncReadyCallback callback, @@ -266,7 +266,7 @@ modem_set_allowed_modes (MMIfaceModem *self, result = g_simple_async_result_new (G_OBJECT (self), callback, user_data, - modem_set_allowed_modes); + modem_set_current_modes); /* * The core has checked the following: @@ -1857,10 +1857,10 @@ iface_modem_init (MMIfaceModem *iface) iface->load_supported_modes = load_supported_modes; iface->load_supported_modes_finish = load_supported_modes_finish; - iface->load_allowed_modes = modem_load_allowed_modes; - iface->load_allowed_modes_finish = modem_load_allowed_modes_finish; - iface->set_allowed_modes = modem_set_allowed_modes; - iface->set_allowed_modes_finish = modem_set_allowed_modes_finish; + iface->load_current_modes = modem_load_current_modes; + iface->load_current_modes_finish = modem_load_current_modes_finish; + iface->set_current_modes = modem_set_current_modes; + iface->set_current_modes_finish = modem_set_current_modes_finish; iface->load_access_technologies = modem_load_access_technologies; iface->load_access_technologies_finish = modem_load_access_technologies_finish; iface->load_unlock_retries = modem_load_unlock_retries; |