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

option: port set_current_modes to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-09-16 15:05:34 +08:00
committed by Aleksander Morgado
parent 78432e7910
commit 6ad9ccbfa2
1 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
plugins/option/mm-broadband-modem-option.c
View File

@@ -214,24 +214,24 @@ set_current_modes_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error); return g_task_propagate_boolean (G_TASK (res), error);
} }
static void static void
allowed_mode_update_ready (MMBroadbandModemOption *self, allowed_mode_update_ready (MMBroadbandModemOption *self,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *operation_result) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error); mm_base_modem_at_command_finish (MM_BASE_MODEM (self), res, &error);
if (error) if (error)
/* Let the error be critical. */ /* Let the error be critical. */
g_simple_async_result_take_error (operation_result, error); g_task_return_error (task, error);
else else
g_simple_async_result_set_op_res_gboolean (operation_result, TRUE); g_task_return_boolean (task, TRUE);
g_simple_async_result_complete (operation_result);
g_object_unref (operation_result); g_object_unref (task);
} }
static void static void
@@ -241,14 +241,11 @@ set_current_modes (MMIfaceModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
gchar *command; gchar *command;
gint option_mode = -1; gint option_mode = -1;
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, NULL, callback, user_data);
callback,
user_data,
set_current_modes);
if (allowed == MM_MODEM_MODE_2G) if (allowed == MM_MODEM_MODE_2G)
option_mode = 0; option_mode = 0;
@@ -270,18 +267,16 @@ set_current_modes (MMIfaceModem *self,
allowed_str = mm_modem_mode_build_string_from_mask (allowed); allowed_str = mm_modem_mode_build_string_from_mask (allowed);
preferred_str = mm_modem_mode_build_string_from_mask (preferred); preferred_str = mm_modem_mode_build_string_from_mask (preferred);
g_simple_async_result_set_error (result, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_FAILED, MM_CORE_ERROR_FAILED,
"Requested mode (allowed: '%s', preferred: '%s') not " "Requested mode (allowed: '%s', preferred: '%s') not "
"supported by the modem.", "supported by the modem.",
allowed_str, allowed_str,
preferred_str); preferred_str);
g_object_unref (task);
g_free (allowed_str); g_free (allowed_str);
g_free (preferred_str); g_free (preferred_str);
g_simple_async_result_complete_in_idle (result);
g_object_unref (result);
return; return;
} }
@@ -292,7 +287,7 @@ set_current_modes (MMIfaceModem *self,
3, 3,
FALSE, FALSE,
(GAsyncReadyCallback)allowed_mode_update_ready, (GAsyncReadyCallback)allowed_mode_update_ready,
result); task);
g_free (command); g_free (command);
} }