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

cli: use new modem enabling and disabling API

Browse Source
This commit is contained in:
Aleksander Morgado
2011-08-20 13:47:05 +02:00
parent ea5f81b804
commit e341c7ff49
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cli/mmcli-modem.c
View File

@@ -442,9 +442,9 @@ disable_ready (MMModem *modem,
gboolean operation_result;
GError *error = NULL;
operation_result = mm_modem_enable_finish (modem,
result,
&error);
operation_result = mm_modem_disable_finish (modem,
result,
&error);
disable_process_reply (operation_result, error);
mmcli_async_operation_done ();
@@ -498,7 +498,6 @@ mmcli_modem_run_asynchronous (GDBusConnection *connection,
/* Request to enable the modem? */
if (ctxt.enable_flag) {
mm_modem_enable_async (ctxt.modem,
TRUE,
cancellable,
(GAsyncReadyCallback)enable_ready,
NULL);
@@ -507,11 +506,10 @@ mmcli_modem_run_asynchronous (GDBusConnection *connection,
/* Request to disable the modem? */
if (ctxt.disable_flag) {
mm_modem_enable_async (ctxt.modem,
FALSE,
cancellable,
(GAsyncReadyCallback)disable_ready,
NULL);
mm_modem_disable_async (ctxt.modem,
cancellable,
(GAsyncReadyCallback)disable_ready,
NULL);
return FALSE;
}
@@ -560,9 +558,7 @@ mmcli_modem_run_synchronous (GDBusConnection *connection)
if (ctxt.enable_flag) {
gboolean result;
result = mm_modem_enable (ctxt.modem,
TRUE,
&error);
result = mm_modem_enable (ctxt.modem, &error);
enable_process_reply (result, error);
return;
}
@@ -571,9 +567,7 @@ mmcli_modem_run_synchronous (GDBusConnection *connection)
if (ctxt.disable_flag) {
gboolean result;
result = mm_modem_enable (ctxt.modem,
FALSE,
&error);
result = mm_modem_disable (ctxt.modem, &error);
disable_process_reply (result, error);
return;
}