From 28f13c09ecf6433385d9b7a8cff5be825d74c9c8 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Mon, 26 Mar 2012 13:00:07 +0200 Subject: mmcli: abort certain operations if modem is unlocked Do not try to perform feature/capability specific actions if we're still unlocked, as the modem didn't yet export the feature/capability specific interface. The only interfaces expected while modem is unlocked are the Modem and Simple interfaces, as well as the SIM interface in the SIM object, of course. --- cli/mmcli-modem-time.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'cli/mmcli-modem-time.c') diff --git a/cli/mmcli-modem-time.c b/cli/mmcli-modem-time.c index 8ec5740c..7bc277c6 100644 --- a/cli/mmcli-modem-time.c +++ b/cli/mmcli-modem-time.c @@ -108,11 +108,17 @@ context_free (Context *ctx) static void ensure_modem_time (void) { - if (ctx->modem_time) - return; + if (mm_modem_get_unlock_required (mm_object_peek_modem (ctx->object)) != MM_MODEM_LOCK_NONE) { + g_printerr ("error: modem not unlocked yet\n"); + exit (EXIT_FAILURE); + } + + if (!ctx->modem_time) { + g_printerr ("error: modem has no time capabilities\n"); + exit (EXIT_FAILURE); + } - g_printerr ("error: modem has no time capabilities\n"); - exit (EXIT_FAILURE); + /* Success */ } void -- cgit v1.2.3-70-g09d2