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/linktop | |
| 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/linktop')
| -rw-r--r-- | plugins/linktop/mm-broadband-modem-linktop.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/linktop/mm-broadband-modem-linktop.c b/plugins/linktop/mm-broadband-modem-linktop.c index bcfa7daf..a23f5320 100644 --- a/plugins/linktop/mm-broadband-modem-linktop.c +++ b/plugins/linktop/mm-broadband-modem-linktop.c @@ -123,7 +123,7 @@ load_supported_modes (MMIfaceModem *self, /* Load initial allowed/preferred modes (Modem interface) */ static gboolean -load_allowed_modes_finish (MMIfaceModem *self, +load_current_modes_finish (MMIfaceModem *self, GAsyncResult *res, MMModemMode *allowed, MMModemMode *preferred, @@ -173,7 +173,7 @@ load_allowed_modes_finish (MMIfaceModem *self, } static void -load_allowed_modes (MMIfaceModem *self, +load_current_modes (MMIfaceModem *self, GAsyncReadyCallback callback, gpointer user_data) { @@ -189,7 +189,7 @@ load_allowed_modes (MMIfaceModem *self, /* Set allowed modes (Modem interface) */ static gboolean -set_allowed_modes_finish (MMIfaceModem *self, +set_current_modes_finish (MMIfaceModem *self, GAsyncResult *res, GError **error) { @@ -214,7 +214,7 @@ allowed_mode_update_ready (MMBroadbandModemLinktop *self, } static void -set_allowed_modes (MMIfaceModem *self, +set_current_modes (MMIfaceModem *self, MMModemMode allowed, MMModemMode preferred, GAsyncReadyCallback callback, @@ -227,7 +227,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 (allowed == MM_MODEM_MODE_2G) linktop_mode = LINKTOP_MODE_2G; @@ -302,10 +302,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 = 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; } static void |