mirror of
https://gitlab.com/mobian1/eg25-manager.git
synced 2025-08-29 23:32:14 +02:00
New upstream release 0.0.6
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
project (
|
||||
'eg25manager',
|
||||
'c',
|
||||
version : '0.0.5',
|
||||
version : '0.0.6',
|
||||
license : 'GPLv3+',
|
||||
meson_version : '>= 0.50.0',
|
||||
default_options :
|
||||
|
@@ -126,7 +126,6 @@ void modem_reset(struct EG25Manager *manager)
|
||||
write(fd, manager->modem_usb_id, strlen(manager->modem_usb_id));
|
||||
close(fd);
|
||||
|
||||
manager->modem_state = EG25_STATE_CONFIGURED;
|
||||
return;
|
||||
|
||||
error:
|
||||
|
@@ -84,13 +84,8 @@ static void interface_removed_cb(struct EG25Manager *manager,
|
||||
|
||||
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;
|
||||
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);
|
||||
|
||||
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);
|
||||
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) {
|
||||
g_bus_unwatch_name(manager->mm_watch);
|
||||
manager->mm_watch = 0;
|
||||
|
@@ -66,7 +66,8 @@ static void take_inhibitor(struct EG25Manager *manager)
|
||||
{
|
||||
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",
|
||||
"eg25manager needs to prepare modem for sleep", "delay");
|
||||
|
Reference in New Issue
Block a user