diff options
author | Aleksander Morgado <aleksander@lanedo.com> | 2011-04-28 12:35:28 +0200 |
---|---|---|
committer | Aleksander Morgado <aleksander@lanedo.com> | 2011-04-29 12:31:07 +0200 |
commit | 466b6edbf72e95bdc5b563ab2ea90df79f3796ea (patch) | |
tree | b0ddb26d9cf7390af3360bb5abb69d9d2a2f2067 | |
parent | 573dcd51c0dace9389f879a3cdd0230ec728dcb6 (diff) |
gsm: allow setting more than one band
-rw-r--r-- | introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml | 12 | ||||
-rw-r--r-- | src/mm-modem-gsm-network.c | 10 |
2 files changed, 6 insertions, 16 deletions
diff --git a/introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml index 7c266818..4a8e8035 100644 --- a/introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml +++ b/introspection/org.freedesktop.ModemManager.Modem.Gsm.Network.xml @@ -87,26 +87,26 @@ <method name="SetBand"> <tp:docstring> - Sets the band the device is allowed to use when connecting to a mobile network. + Sets the bands the device is allowed to use when connecting to a mobile network. </tp:docstring> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_set_band"/> <arg name="band" type="u" direction="in" tp:type="MM_MODEM_GSM_BAND"> <tp:docstring> - The desired band. Only one band may be specified, and may not be UNKNOWN. + The desired bands, as a set of flags. </tp:docstring> </arg> </method> <method name="GetBand"> <tp:docstring> - Returns the current band the device is using. (Note for plugin writers: returned value must not be ANY) + Returns the current bands the device is using. (Note for plugin writers: returned value must not be ANY) </tp:docstring> <annotation name="org.freedesktop.DBus.GLib.Async" value=""/> <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_gsm_modem_get_band"/> <arg name="band" type="u" direction="out" tp:type="MM_MODEM_GSM_BAND"> <tp:docstring> - The current band. + The current bands, as a set of flags. </tp:docstring> </arg> </method> @@ -160,7 +160,7 @@ <li> Current operator code of the operator to which the mobile is currently registered. Returned in the format "MCCMNC", where MCC - is the three-digit ITU E.212 Mobile Country Code and MNC is the + is the three-digit ITU E.212 Mobile Country Code and MNC is the two- or three-digit GSM Mobile Network Code. If the MCC and MNC are not known or the mobile is not registered to a mobile network, this value should be a zero-length (blank) string. e.g. "31026" @@ -233,7 +233,7 @@ <tp:docstring> Current operator code of the operator to which the mobile is currently registered. Returned in the format "MCCMNC", where MCC - is the three-digit ITU E.212 Mobile Country Code and MNC is the + is the three-digit ITU E.212 Mobile Country Code and MNC is the two- or three-digit GSM Mobile Network Code. If the MCC and MNC are not known or the mobile is not registered to a mobile network, this value should be a zero-length (blank) string. e.g. "31026" or diff --git a/src/mm-modem-gsm-network.c b/src/mm-modem-gsm-network.c index 75ca7de9..d82bf792 100644 --- a/src/mm-modem-gsm-network.c +++ b/src/mm-modem-gsm-network.c @@ -496,16 +496,6 @@ impl_gsm_modem_set_band (MMModemGsmNetwork *modem, MMModemGsmBand band, DBusGMethodInvocation *context) { - if (!check_for_single_value (band)) { - GError *error; - - error = g_error_new_literal (MM_MODEM_ERROR, MM_MODEM_ERROR_OPERATION_NOT_SUPPORTED, - "Invalid arguments (more than one value given)"); - dbus_g_method_return_error (context, error); - g_error_free (error); - return; - } - mm_modem_gsm_network_set_band (modem, band, async_call_done, context); } |