diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-01-16 09:51:57 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-15 14:14:51 +0100 |
| commit | 6238ba8568323db3c7a52f19f691cf6105b9c585 (patch) | |
| tree | 991cb871acd3c1be2c2e3b4d04913fcc67ba7f43 | |
| parent | 15f2c56f8978dafcc0db7744f1a95fae52e8c91e (diff) | |
api,dbus: don't return immediate CDMA activation errors
Seems like an unnecessary complication, as the client anyway needs to handle
asynchronously reported errors.
| -rw-r--r-- | new/org.freedesktop.ModemManager1.Modem.ModemCdma.xml | 7 | ||||
| -rw-r--r-- | src/mm-iface-modem-cdma.c | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/new/org.freedesktop.ModemManager1.Modem.ModemCdma.xml b/new/org.freedesktop.ModemManager1.Modem.ModemCdma.xml index 4705704a..0b0841ae 100644 --- a/new/org.freedesktop.ModemManager1.Modem.ModemCdma.xml +++ b/new/org.freedesktop.ModemManager1.Modem.ModemCdma.xml @@ -23,18 +23,13 @@ <!-- Activate: @carrier: Name of carrier. - @immediate_error: A <link linkend="MMModemCdmaActivationError">MMModemCdmaActivationError</link> value, which is returned for immediate errors. Delayed errors are returned via an #org.freedesktop.ModemManager1.Modem.Cdma::ActivationStateChanged signal. Provisions the modem for use with a given carrier using the modem's <ulink url="http://en.wikipedia.org/wiki/Over-the-air_programming">Over-The-Air (OTA)</ulink> activation functionality, if any. - - In the event of immediate failure, returns an error value instead of - setting a DBus error. --> <method name="Activate"> - <arg name="carrier" type="s" direction="in" /> - <arg name="immediate_error" type="u" direction="out" /> + <arg name="carrier" type="s" direction="in" /> </method> <!-- diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c index 2ce7796d..ed5e5407 100644 --- a/src/mm-iface-modem-cdma.c +++ b/src/mm-iface-modem-cdma.c @@ -159,9 +159,7 @@ handle_activate_ready (MMIfaceModemCdma *self, error); else mm_gdbus_modem_cdma_complete_activate (ctx->skeleton, - ctx->invocation, - MM_MODEM_CDMA_ACTIVATION_ERROR_NONE -); + ctx->invocation); dbus_call_context_free (ctx); } |