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

cli: fail if requesting CDMA actions and modem is not CDMA

Browse Source
This commit is contained in:
Aleksander Morgado
2012-01-24 17:11:18 +01:00
parent 0527667500
commit c075363c2c
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cli/mmcli-modem-cdma.c
View File

@@ -105,6 +105,16 @@ context_free (Context *ctx)
g_free (ctx); g_free (ctx);
} }
static void
ensure_modem_cdma (void)
{
if (ctx->modem_cdma)
return;
g_printerr ("error: modem has no CDMA capabilities");
exit (EXIT_FAILURE);
}
void void
mmcli_modem_cdma_shutdown (void) mmcli_modem_cdma_shutdown (void)
{ {
@@ -146,6 +156,8 @@ get_modem_ready (GObject *source,
ctx->object = mmcli_get_modem_finish (result, &ctx->manager); ctx->object = mmcli_get_modem_finish (result, &ctx->manager);
ctx->modem_cdma = mm_object_get_modem_cdma (ctx->object); ctx->modem_cdma = mm_object_get_modem_cdma (ctx->object);
ensure_modem_cdma ();
/* Request to activate the modem? */ /* Request to activate the modem? */
if (activate_str) { if (activate_str) {
g_debug ("Asynchronously activating the modem..."); g_debug ("Asynchronously activating the modem...");
@@ -189,6 +201,8 @@ mmcli_modem_cdma_run_synchronous (GDBusConnection *connection)
&ctx->manager); &ctx->manager);
ctx->modem_cdma = mm_object_get_modem_cdma (ctx->object); ctx->modem_cdma = mm_object_get_modem_cdma (ctx->object);
ensure_modem_cdma ();
/* Request to activate the modem? */ /* Request to activate the modem? */
if (activate_str) { if (activate_str) {
gboolean result; gboolean result;