diff options
| author | Dan Williams <dan@ioncontrol.co> | 2025-05-08 20:10:48 -0500 |
|---|---|---|
| committer | Dan Williams <dan@ioncontrol.co> | 2025-05-08 20:10:48 -0500 |
| commit | efcc960b130356e6b05d05a915ff0f9646b00d5f (patch) | |
| tree | cf209fc07098e68c65dca219fee38a826dbcbf1a /src/mm-device.c | |
| parent | 02942a04f95f64cda36360c72961fe0e20459ad4 (diff) | |
| parent | 1fa21fcc48b271a8dc2191104e35bf4e95fa2331 (diff) | |
Merge request !1344 from 'cbm-remove-modem'
Begin removing usage of MMBaseModem from leaf classes
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/merge_requests/1344
Diffstat (limited to 'src/mm-device.c')
| -rw-r--r-- | src/mm-device.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mm-device.c b/src/mm-device.c index 96b7d874..b991f18d 100644 --- a/src/mm-device.c +++ b/src/mm-device.c @@ -27,6 +27,7 @@ #include "mm-plugin.h" #include "mm-log-object.h" #include "mm-daemon-enums-types.h" +#include "mm-bind.h" static void log_object_iface_init (MMLogObjectInterface *iface); @@ -341,7 +342,7 @@ unexport_modem (MMDevice *self) if (path != NULL) { g_dbus_object_manager_server_unexport (self->priv->object_manager, path); g_object_set (self->priv->modem, - MM_BASE_MODEM_CONNECTION, NULL, + MM_BINDABLE_CONNECTION, NULL, NULL); mm_obj_dbg (self, "unexported modem from path '%s'", path); g_free (path); @@ -389,7 +390,7 @@ export_modem (MMDevice *self) path = g_strdup_printf (MM_DBUS_MODEM_PREFIX "/%d", mm_base_modem_get_dbus_id (self->priv->modem)); g_object_set (self->priv->modem, "g-object-path", path, - MM_BASE_MODEM_CONNECTION, connection, + MM_BINDABLE_CONNECTION, connection, NULL); g_dbus_object_manager_server_export (self->priv->object_manager, @@ -436,7 +437,7 @@ mm_device_initialize_modem (MMDevice *self) mm_obj_dbg (self, "modem initializing..."); mm_base_modem_initialize (modem, - MM_BASE_MODEM_OPERATION_LOCK_REQUIRED, + MM_OPERATION_LOCK_REQUIRED, (GAsyncReadyCallback)initialize_ready, g_object_ref (self)); } @@ -868,8 +869,8 @@ mm_device_inhibit (MMDevice *self, * an exclusive lock marked as override, so the modem object will not * allow any additional lock request any more. */ mm_base_modem_disable (self->priv->modem, - MM_BASE_MODEM_OPERATION_LOCK_REQUIRED, - MM_BASE_MODEM_OPERATION_PRIORITY_OVERRIDE, + MM_OPERATION_LOCK_REQUIRED, + MM_OPERATION_PRIORITY_OVERRIDE, (GAsyncReadyCallback)inhibit_disable_ready, task); } |