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

libmm-glib,modem: port mm_modem_get_sim to use GTask

Browse Source
This commit is contained in:
Ben Chan
2017-06-23 09:11:06 -07:00
committed by Aleksander Morgado
parent 2327ebddf1
commit d84bb54e77
1 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
libmm-glib/mm-modem.c
View File

@@ -2836,23 +2836,15 @@ mm_modem_get_sim_finish (MMModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error) GError **error)
{ {
MMSim *sim;
g_return_val_if_fail (MM_IS_MODEM (self), NULL); g_return_val_if_fail (MM_IS_MODEM (self), NULL);
if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error)) return g_task_propagate_pointer (G_TASK (res), error);
return NULL;
sim = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (res));
g_return_val_if_fail (sim != NULL, NULL);
return MM_SIM (g_object_ref (sim));
} }
static void static void
modem_get_sim_ready (GDBusConnection *connection, modem_get_sim_ready (GDBusConnection *connection,
GAsyncResult *res, GAsyncResult *res,
GSimpleAsyncResult *simple) GTask *task)
{ {
GError *error = NULL; GError *error = NULL;
GObject *sim; GObject *sim;
@@ -2863,14 +2855,11 @@ modem_get_sim_ready (GDBusConnection *connection,
g_object_unref (source_object); g_object_unref (source_object);
if (error) if (error)
g_simple_async_result_take_error (simple, error); g_task_return_error (task, error);
else else
g_simple_async_result_set_op_res_gpointer (simple, g_task_return_pointer (task, sim, g_object_unref);
sim,
g_object_unref);
g_simple_async_result_complete (simple); g_object_unref (task);
g_object_unref (simple);
} }
/** /**
@@ -2893,24 +2882,20 @@ mm_modem_get_sim (MMModem *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
GSimpleAsyncResult *result; GTask *task;
const gchar *sim_path; const gchar *sim_path;
g_return_if_fail (MM_IS_MODEM (self)); g_return_if_fail (MM_IS_MODEM (self));
result = g_simple_async_result_new (G_OBJECT (self), task = g_task_new (self, cancellable, callback, user_data);
callback,
user_data,
mm_modem_get_sim);
sim_path = mm_modem_get_sim_path (self); sim_path = mm_modem_get_sim_path (self);
if (!sim_path || g_str_equal (sim_path, "/")) { if (!sim_path || g_str_equal (sim_path, "/")) {
g_simple_async_result_set_error (result, g_task_return_new_error (task,
MM_CORE_ERROR, MM_CORE_ERROR,
MM_CORE_ERROR_NOT_FOUND, MM_CORE_ERROR_NOT_FOUND,
"No SIM object available"); "No SIM object available");
g_simple_async_result_complete_in_idle (result); g_object_unref (task);
g_object_unref (result);
return; return;
} }
@@ -2918,7 +2903,7 @@ mm_modem_get_sim (MMModem *self,
G_PRIORITY_DEFAULT, G_PRIORITY_DEFAULT,
cancellable, cancellable,
(GAsyncReadyCallback)modem_get_sim_ready, (GAsyncReadyCallback)modem_get_sim_ready,
result, task,
"g-flags", G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, "g-flags", G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
"g-name", MM_DBUS_SERVICE, "g-name", MM_DBUS_SERVICE,
"g-connection", g_dbus_proxy_get_connection (G_DBUS_PROXY (self)), "g-connection", g_dbus_proxy_get_connection (G_DBUS_PROXY (self)),