From cc99ab562b2f47f48f5ed9e5afa0c23a4a5c32cd Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Mon, 23 Mar 2020 05:45:13 +0100 Subject: cli: consolidate logic to process user provided object lookup info The user may specify DBus objects in several ways, e.g. with full object paths, just with the object numeric ids, or in some other cases with the full device UID. Setup one single method to process this info for all object types, so that it's also easier to add new lookup methods for all at the same time. --- cli/mmcli-common.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'cli/mmcli-common.h') diff --git a/cli/mmcli-common.h b/cli/mmcli-common.h index e3d96c0c..237ebb55 100644 --- a/cli/mmcli-common.h +++ b/cli/mmcli-common.h @@ -34,18 +34,18 @@ MMManager *mmcli_get_manager_finish (GAsyncResult *res); MMManager *mmcli_get_manager_sync (GDBusConnection *connection); void mmcli_get_modem (GDBusConnection *connection, - const gchar *modem_str, + const gchar *str, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); MMObject *mmcli_get_modem_finish (GAsyncResult *res, MMManager **o_manager); MMObject *mmcli_get_modem_sync (GDBusConnection *connection, - const gchar *modem_str, + const gchar *str, MMManager **o_manager); void mmcli_get_bearer (GDBusConnection *connection, - const gchar *path_or_index, + const gchar *str, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); @@ -53,12 +53,12 @@ MMBearer *mmcli_get_bearer_finish (GAsyncResult *res, MMManager **manager, MMObject **object); MMBearer *mmcli_get_bearer_sync (GDBusConnection *connection, - const gchar *path_or_index, + const gchar *str, MMManager **manager, MMObject **object); void mmcli_get_sim (GDBusConnection *connection, - const gchar *path_or_index, + const gchar *str, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); @@ -66,12 +66,12 @@ MMSim *mmcli_get_sim_finish (GAsyncResult *res, MMManager **manager, MMObject **object); MMSim *mmcli_get_sim_sync (GDBusConnection *connection, - const gchar *path_or_index, + const gchar *str, MMManager **manager, MMObject **object); void mmcli_get_sms (GDBusConnection *connection, - const gchar *path_or_index, + const gchar *str, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); @@ -79,12 +79,12 @@ MMSms *mmcli_get_sms_finish (GAsyncResult *res, MMManager **manager, MMObject **object); MMSms *mmcli_get_sms_sync (GDBusConnection *connection, - const gchar *path_or_index, + const gchar *str, MMManager **manager, MMObject **object); void mmcli_get_call (GDBusConnection *connection, - const gchar *path_or_index, + const gchar *str, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data); @@ -92,7 +92,7 @@ MMCall *mmcli_get_call_finish (GAsyncResult *res, MMManager **manager, MMObject **object); MMCall *mmcli_get_call_sync (GDBusConnection *connection, - const gchar *path_or_index, + const gchar *str, MMManager **manager, MMObject **object); -- cgit v1.2.3-70-g09d2