cli: don't assume every modem exposes the Messaging interface

2012-03-16 14:53:25 +01:00
parent 346de780be
commit 979c520381
1 changed files with 14 additions and 8 deletions
@@ -873,16 +873,22 @@ look_for_sms_in_modem (GetSmsContext *ctx)
    /* Loop looking for the sms in each modem found */
    ctx->current = MM_OBJECT (ctx->modems->data);
    ctx->modems = g_list_delete_link (ctx->modems, ctx->modems);
-    g_debug ("Looking for sms '%s' in modem '%s'...",
-             ctx->sms_path,
-             mm_object_get_path (ctx->current));

    modem = mm_object_get_modem_messaging (ctx->current);
-    mm_modem_messaging_list (modem,
-                             ctx->cancellable,
-                             (GAsyncReadyCallback)list_sms_ready,
-                             ctx);
-    g_object_unref (modem);
+    if (modem) {
+        g_debug ("Looking for sms '%s' in modem '%s'...",
+                 ctx->sms_path,
+                 mm_object_get_path (ctx->current));
+        mm_modem_messaging_list (modem,
+                                 ctx->cancellable,
+                                 (GAsyncReadyCallback)list_sms_ready,
+                                 ctx);
+        g_object_unref (modem);
+        return;
+    }
+
+    /* Current modem has no messaging capabilities, try with next modem */
+    look_for_sms_in_modem (ctx);
 }

 static void