rozniak/xfce-winxp-tc
1
0
Fork 0
mirror of https://github.com/rozniak/xfce-winxp-tc.git synced 2026-05-05 05:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check if up_client_new returns null

Browse Source 
Null indicates failure to connect to upowerd, return gracefully instead of segfaulting
This commit is contained in:
Simon Li
2025-06-21 12:07:42 +01:00
committed by Rory Fewell
parent 14cbd530d1
commit 89d715428b
1 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
shell/taskband/src/systray/power.c
View File

@@ -111,39 +111,46 @@ static void wintc_notification_power_constructed(
UpDevice* device; UpDevice* device;
power->up_client = up_client_new(); power->up_client = up_client_new();
WINTC_LOG_DEBUG("Connected to upower"); if (power->up_client)
all_devices = up_client_get_devices2(power->up_client);
for (guint i = 0; i < all_devices->len; i++)
{ {
device = all_devices->pdata[i]; WINTC_LOG_DEBUG("Connected to upower");
check_and_register_battery(power, device); all_devices = up_client_get_devices2(power->up_client);
for (guint i = 0; i < all_devices->len; i++)
{
device = all_devices->pdata[i];
check_and_register_battery(power, device);
}
g_signal_connect(
power->up_client,
"device-added",
G_CALLBACK(on_up_client_device_added),
power
);
g_signal_connect(
power->up_client,
"device-removed",
G_CALLBACK(on_up_client_device_removed),
power
);
g_signal_connect(
power->up_client,
"notify::on-battery",
G_CALLBACK(on_up_client_battery_notify),
power
);
update_client_on_battery(power, power->up_client);
g_ptr_array_unref(all_devices);
}
else
{
g_warning("Failed to connect to upower");
} }
g_signal_connect(
power->up_client,
"device-added",
G_CALLBACK(on_up_client_device_added),
power
);
g_signal_connect(
power->up_client,
"device-removed",
G_CALLBACK(on_up_client_device_removed),
power
);
g_signal_connect(
power->up_client,
"notify::on-battery",
G_CALLBACK(on_up_client_battery_notify),
power
);
update_client_on_battery(power, power->up_client);
g_ptr_array_unref(all_devices);
(G_OBJECT_CLASS( (G_OBJECT_CLASS(
wintc_notification_power_parent_class wintc_notification_power_parent_class