dany/eg25-manager
1
0
Fork 0
mirror of https://gitlab.com/mobian1/eg25-manager.git synced 2025-08-31 00:02:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

mm-iface: keep watching bus if MM vanishes

Browse Source
This commit is contained in:
Arnaud Ferraris
2021-01-25 23:55:57 +01:00
parent 692f9134f8
commit 3bb6e15de0
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/mm-iface.c
View File

@@ -167,12 +167,24 @@ static void mm_appeared_cb(GDBusConnection *connection,
NULL, (GAsyncReadyCallback)mm_manager_new_cb, manager); NULL, (GAsyncReadyCallback)mm_manager_new_cb, manager);
} }
static void mm_iface_clean(struct EG25Manager *manager)
{
if (manager->mm_manager) {
g_clear_object(&manager->mm_manager);
manager->mm_manager = NULL;
}
if (manager->modem_usb_id) {
g_free(manager->modem_usb_id);
manager->modem_usb_id = NULL;
}
}
static void mm_vanished_cb(GDBusConnection *connection, static void mm_vanished_cb(GDBusConnection *connection,
const gchar *name, const gchar *name,
struct EG25Manager *manager) struct EG25Manager *manager)
{ {
g_message("ModemManager vanished from D-Bus"); g_message("ModemManager vanished from D-Bus");
mm_iface_destroy(manager); mm_iface_clean(manager);
} }
void mm_iface_init(struct EG25Manager *manager) void mm_iface_init(struct EG25Manager *manager)
@@ -186,14 +198,7 @@ void mm_iface_init(struct EG25Manager *manager)
void mm_iface_destroy(struct EG25Manager *manager) void mm_iface_destroy(struct EG25Manager *manager)
{ {
if (manager->mm_manager) { mm_iface_clean(manager);
g_clear_object(&manager->mm_manager);
manager->mm_manager = NULL;
}
if (manager->modem_usb_id) {
g_free(manager->modem_usb_id);
manager->modem_usb_id = NULL;
}
if (manager->mm_watch != 0) { if (manager->mm_watch != 0) {
g_bus_unwatch_name(manager->mm_watch); g_bus_unwatch_name(manager->mm_watch);
manager->mm_watch = 0; manager->mm_watch = 0;