mbim: use the new response checker helper method

mbim_message_response_get_result() is available in libmbim-glib 1.11.1.

6 files changed, 32 insertions, 32 deletions

diff --git a/configure.ac b/configure.ac
index c0064d217..9e8587dcc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -201,7 +201,7 @@ AC_ARG_WITH(mbim, AS_HELP_STRING([--without-mbim], [Build without MBIM support])
 AM_CONDITIONAL(WITH_MBIM, test "x$with_mbim" = "xyes")
 case $with_mbim in
     yes)
-        PKG_CHECK_MODULES(MBIM, [mbim-glib >= 1.10], [have_mbim=yes],[have_mbim=no])
+        PKG_CHECK_MODULES(MBIM, [mbim-glib >= 1.11.1], [have_mbim=yes],[have_mbim=no])
         if test "x$have_mbim" = "xno"; then
             AC_MSG_ERROR([Couldn't find libmbim-glib. Install it, or otherwise configure using --without-mbim to disable MBIM support.])
         else
diff --git a/src/mm-bearer-mbim.c b/src/mm-bearer-mbim.c
index 5d0fc5c94..e0abccfef 100644
--- a/src/mm-bearer-mbim.c
+++ b/src/mm-bearer-mbim.c
@@ -185,7 +185,7 @@ ip_configuration_query_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_BEARER_MODEM, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_ip_configuration_response_parse (
             response,
             NULL, /* sessionid */
@@ -465,7 +465,7 @@ connect_set_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_BEARER_MODEM, response, error);
 
     if (response &&
-        (mbim_message_command_done_get_result (response, &error) ||
+        (mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) ||
          error->code == MBIM_STATUS_ERROR_FAILURE)) {
         GError *inner_error = NULL;
 
@@ -527,7 +527,7 @@ provisioned_contexts_query_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_BEARER_MODEM, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_provisioned_contexts_response_parse (
             response,
             &provisioned_contexts_count,
@@ -583,7 +583,7 @@ packet_service_set_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_BEARER_MODEM, response, error);
 
     if (response &&
-        (mbim_message_command_done_get_result (response, &error) ||
+        (mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) ||
          error->code == MBIM_STATUS_ERROR_FAILURE)) {
         GError *inner_error = NULL;
 
@@ -992,7 +992,7 @@ disconnect_set_ready (MbimDevice *device,
         GError *inner_error = NULL;
         gboolean result = FALSE, parsed_result = FALSE;
 
-        result = mbim_message_command_done_get_result (response, &error);
+        result = mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error);
         /* Parse the response only for the cases we need to */
         if (result ||
             g_error_matches (error, MBIM_STATUS_ERROR, MBIM_STATUS_ERROR_FAILURE) ||
diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c
index 530faf0ee..331b3e399 100644
--- a/src/mm-broadband-modem-mbim.c
+++ b/src/mm-broadband-modem-mbim.c
@@ -172,7 +172,7 @@ device_caps_query_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, NULL, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_device_caps_response_parse (
             response,
             NULL, /* device_type */
@@ -557,7 +557,7 @@ pin_query_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, NULL, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_pin_response_parse (
             response,
             &pin_type,
@@ -605,7 +605,7 @@ unlock_required_subscriber_ready_state_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, NULL, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_subscriber_ready_status_response_parse (
             response,
             &ready_state,
@@ -756,7 +756,7 @@ pin_query_unlock_retries_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, NULL, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_pin_response_parse (
             response,
             &pin_type,
@@ -838,7 +838,7 @@ own_numbers_subscriber_ready_state_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, NULL, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_subscriber_ready_status_response_parse (
             response,
             NULL, /* ready_state */
@@ -913,7 +913,7 @@ radio_state_query_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, NULL, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_radio_state_response_parse (
             response,
             &hardware_radio_state,
@@ -988,7 +988,7 @@ radio_state_set_down_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, NULL, response, error);
 
     if (response)
-        mbim_message_command_done_get_result (response, &error);
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error);
 
     if (error)
         g_simple_async_result_take_error (ctx->result, error);
@@ -1015,7 +1015,7 @@ radio_state_set_up_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, NULL, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_radio_state_response_parse (
             response,
             &hardware_radio_state,
@@ -1468,7 +1468,7 @@ pin_list_query_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, NULL, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_pin_list_response_parse (
             response,
             &pin_desc_pin1,
@@ -1866,7 +1866,7 @@ alert_sms_read_query_ready (MbimDevice *device,
     mm_track_mbim_status (self, NULL, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_sms_read_response_parse (
             response,
             NULL,
@@ -2116,7 +2116,7 @@ subscribe_list_set_ready_cb (MbimDevice *device,
     mm_track_mbim_status (ctx->self, NULL, response, error);
 
     if (response)
-        mbim_message_command_done_get_result (response, &error);
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error);
 
     if (error)
         g_simple_async_result_take_error (ctx->result, error);
@@ -2378,7 +2378,7 @@ register_state_query_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, NULL, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_register_state_response_parse (
             response,
             NULL, /* nw_error */
@@ -2459,7 +2459,7 @@ register_state_set_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, NULL, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_register_state_response_parse (
             response,
             &nw_error,
@@ -2543,7 +2543,7 @@ modem_3gpp_scan_networks_finish (MMIfaceModem3gpp *self,
         return NULL;
 
     response = (MbimMessage *)g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
-    if (mbim_message_command_done_get_result (response, error) &&
+    if (mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, error) &&
         mbim_message_visible_providers_response_parse (response,
                                                        &n_providers,
                                                        &providers,
@@ -2731,7 +2731,7 @@ sms_read_query_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, NULL, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_sms_read_response_parse (
             response,
             NULL,
diff --git a/src/mm-modem-helpers-mbim.c b/src/mm-modem-helpers-mbim.c
index d0d44bf75..7406c5267 100644
--- a/src/mm-modem-helpers-mbim.c
+++ b/src/mm-modem-helpers-mbim.c
@@ -60,7 +60,7 @@ mm_track_mbim_status (gpointer           obj,
         g_object_set_data (G_OBJECT (modem), CONSECUTIVE_TIMEOUTS_DATA, NULL);
 
         /* Not-opened errors are reported by the modem in a MBIM message */
-        if (response && !mbim_message_command_done_get_result (response, &inner_error)) {
+        if (response && !mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &inner_error)) {
             if (g_error_matches (inner_error, MBIM_PROTOCOL_ERROR, MBIM_PROTOCOL_ERROR_NOT_OPENED)) {
                 mm_warn ("MBIM device is not opened, reporting invalid modem...");
                 mm_base_modem_reset (modem);
diff --git a/src/mm-sim-mbim.c b/src/mm-sim-mbim.c
index 5d744821c..21e34620c 100644
--- a/src/mm-sim-mbim.c
+++ b/src/mm-sim-mbim.c
@@ -121,7 +121,7 @@ simid_subscriber_ready_state_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_SIM_MODEM, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_subscriber_ready_status_response_parse (
             response,
             NULL, /* ready_state */
@@ -191,7 +191,7 @@ imsi_subscriber_ready_state_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_SIM_MODEM, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_subscriber_ready_status_response_parse (
             response,
             NULL, /* ready_state */
@@ -265,7 +265,7 @@ load_operator_identifier_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_SIM_MODEM, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_home_provider_response_parse (
             response,
             &provider,
@@ -334,7 +334,7 @@ load_operator_name_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_SIM_MODEM, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_home_provider_response_parse (
             response,
             &provider,
@@ -398,7 +398,7 @@ pin_set_enter_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_SIM_MODEM, response, error);
 
     if (response &&
-        !mbim_message_command_done_get_result (response, &error)) {
+        !mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error)) {
         /* Sending PIN failed, build a better error to report */
         if (mbim_message_pin_response_parse (
                 response,
@@ -491,7 +491,7 @@ puk_set_enter_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_SIM_MODEM, response, error);
 
     if (response &&
-        !mbim_message_command_done_get_result (response, &error)) {
+        !mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error)) {
         /* Sending PUK failed, build a better error to report */
         if (mbim_message_pin_response_parse (
                 response,
@@ -582,7 +582,7 @@ pin_set_enable_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_SIM_MODEM, response, error);
 
     if (response) {
-        mbim_message_command_done_get_result (response, &error);
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error);
         mbim_message_unref (response);
     }
 
@@ -662,7 +662,7 @@ pin_set_change_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_SIM_MODEM, response, error);
 
     if (response) {
-        mbim_message_command_done_get_result (response, &error);
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error);
         mbim_message_unref (response);
     }
 
diff --git a/src/mm-sms-mbim.c b/src/mm-sms-mbim.c
index 441723ceb..591367ae2 100644
--- a/src/mm-sms-mbim.c
+++ b/src/mm-sms-mbim.c
@@ -116,7 +116,7 @@ sms_send_set_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_SMS_MODEM, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error) &&
         mbim_message_sms_send_response_parse (
             response,
             &message_reference,
@@ -254,7 +254,7 @@ sms_delete_set_ready (MbimDevice *device,
     mm_track_mbim_status (ctx->self, MM_BASE_SMS_MODEM, response, error);
 
     if (response &&
-        mbim_message_command_done_get_result (response, &error))
+        mbim_message_response_get_result (response, MBIM_MESSAGE_TYPE_COMMAND_DONE, &error))
         mbim_message_sms_delete_response_parse (response, &error);
 
     if (response)