colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iface-modem-simple: don't call the enable() methods in the class directly

Browse Source 
Use the new `mm_base_modem_enable()' instead, which will pass down the
modem-wide cancellable to the enable() implementation.
This commit is contained in:
Aleksander Morgado
2012-03-16 15:21:56 +01:00
parent 686cfbb2c0
commit 1dbe4a12cf
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mm-iface-modem-simple.c
View File

@@ -319,7 +319,7 @@ enable_ready (MMBaseModem *self,
{ {
GError *error = NULL; 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); g_dbus_method_invocation_take_error (ctx->invocation, error);
connection_context_free (ctx); connection_context_free (ctx);
return; return;
@@ -428,10 +428,9 @@ connection_step (ConnectionContext *ctx)
case CONNECTION_STEP_ENABLE: case CONNECTION_STEP_ENABLE:
mm_info ("Simple connect state (%d/%d): Enable", mm_info ("Simple connect state (%d/%d): Enable",
ctx->step, CONNECTION_STEP_LAST); ctx->step, CONNECTION_STEP_LAST);
MM_BASE_MODEM_GET_CLASS (ctx->self)->enable (MM_BASE_MODEM (ctx->self), mm_base_modem_enable (MM_BASE_MODEM (ctx->self),
NULL, /* cancellable */ (GAsyncReadyCallback)enable_ready,
(GAsyncReadyCallback)enable_ready, ctx);
ctx);
return; return;
case CONNECTION_STEP_ALLOWED_MODES: { case CONNECTION_STEP_ALLOWED_MODES: {