diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-16 15:21:56 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-16 15:21:56 +0100 |
| commit | 1dbe4a12cf88bf4e5bd1dab4aab170040747362b (patch) | |
| tree | 22b33b1417efd4e629506767971c3011c232d477 | |
| parent | 686cfbb2c003b7023394b5c9a1eaa85671210815 (diff) | |
| download | ModemManager-1dbe4a12cf88bf4e5bd1dab4aab170040747362b.tar.gz | |
iface-modem-simple: don't call the enable() methods in the class directly
Use the new `mm_base_modem_enable()' instead, which will pass down the
modem-wide cancellable to the enable() implementation.
| -rw-r--r-- | src/mm-iface-modem-simple.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mm-iface-modem-simple.c b/src/mm-iface-modem-simple.c index 24448b29f..f1967b658 100644 --- a/src/mm-iface-modem-simple.c +++ b/src/mm-iface-modem-simple.c @@ -319,7 +319,7 @@ enable_ready (MMBaseModem *self, { GError *error = NULL; - if (!MM_BASE_MODEM_GET_CLASS (self)->enable_finish (MM_BASE_MODEM (self), res, &error)) { + if (!mm_base_modem_enable_finish (MM_BASE_MODEM (self), res, &error)) { g_dbus_method_invocation_take_error (ctx->invocation, error); connection_context_free (ctx); return; @@ -428,10 +428,9 @@ connection_step (ConnectionContext *ctx) case CONNECTION_STEP_ENABLE: mm_info ("Simple connect state (%d/%d): Enable", ctx->step, CONNECTION_STEP_LAST); - MM_BASE_MODEM_GET_CLASS (ctx->self)->enable (MM_BASE_MODEM (ctx->self), - NULL, /* cancellable */ - (GAsyncReadyCallback)enable_ready, - ctx); + mm_base_modem_enable (MM_BASE_MODEM (ctx->self), + (GAsyncReadyCallback)enable_ready, + ctx); return; case CONNECTION_STEP_ALLOWED_MODES: { |