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

New upstream release 0.0.6

Browse Source
This commit is contained in:
Arnaud Ferraris
2020-12-11 15:10:40 +01:00
parent c77490a2ac ff60016e5d
commit fc915f570d
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@@ -8,7 +8,7 @@
project ( project (
'eg25manager', 'eg25manager',
'c', 'c',
version : '0.0.5', version : '0.0.6',
license : 'GPLv3+', license : 'GPLv3+',
meson_version : '>= 0.50.0', meson_version : '>= 0.50.0',
default_options : default_options :

1
src/manager.c
View File

@@ -126,7 +126,6 @@ void modem_reset(struct EG25Manager *manager)
write(fd, manager->modem_usb_id, strlen(manager->modem_usb_id)); write(fd, manager->modem_usb_id, strlen(manager->modem_usb_id));
close(fd); close(fd);
manager->modem_state = EG25_STATE_CONFIGURED;
return; return;
error: error:

15
src/mm-iface.c
View File

@@ -84,13 +84,8 @@ static void interface_removed_cb(struct EG25Manager *manager,
g_message("ModemManager interface `%s' removed on object `%s'", info->name, path); g_message("ModemManager interface `%s' removed on object `%s'", info->name, path);
if (g_strcmp0(info->name, MM_DBUS_INTERFACE_MODEM) == 0) { if (g_strcmp0(info->name, MM_DBUS_INTERFACE_MODEM) == 0)
manager->mm_modem = NULL; manager->mm_modem = NULL;
if (manager->modem_usb_id) {
g_free(manager->modem_usb_id);
manager->modem_usb_id = NULL;
}
}
} }
@@ -133,10 +128,6 @@ static void object_removed_cb(struct EG25Manager *manager, GDBusObject *object)
g_message("ModemManager object `%s' removed", path); g_message("ModemManager object `%s' removed", path);
manager->mm_modem = NULL; manager->mm_modem = NULL;
if (manager->modem_usb_id) {
g_free(manager->modem_usb_id);
manager->modem_usb_id = NULL;
}
} }
@@ -196,6 +187,10 @@ void mm_iface_destroy(struct EG25Manager *manager)
g_clear_object(&manager->mm_manager); g_clear_object(&manager->mm_manager);
manager->mm_manager = NULL; 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;

3
src/suspend.c
View File

@@ -66,7 +66,8 @@ static void take_inhibitor(struct EG25Manager *manager)
{ {
GVariant *variant_arg; GVariant *variant_arg;
g_assert(manager->suspend_inhibit_fd == -1); if(manager->suspend_inhibit_fd != -1)
drop_inhibitor(manager);
variant_arg = g_variant_new ("(ssss)", "sleep", "eg25manager", variant_arg = g_variant_new ("(ssss)", "sleep", "eg25manager",
"eg25manager needs to prepare modem for sleep", "delay"); "eg25manager needs to prepare modem for sleep", "delay");