snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

wmbattery: upower - don't exit after suspend/hibernation wakup

Browse source 
Immediately after suspend/hibernation wakup cycle, up_client_get_devices()
can fail:

 libupower-glib-WARNING **: up_client_get_devices failed: Timeout was reached

Since we do not interpret the UPower signals, just don't exit wmbattery after
first up_client_get_devices() failure.
This commit is contained in:
Christoph Fritz 2015-05-13 23:38:51 -05:00 committed by Carlos R. Mafra
parent a8858dedde
commit 9c6faa3682
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wmbattery/upower.c
View file

@ -9,6 +9,8 @@
#include <upower.h> #include <upower.h>
#include "apm.h" #include "apm.h"
#define MAX_RETRIES 3
static UpClient * up; static UpClient * up;
struct context { struct context {
@ -74,6 +76,7 @@ int upower_supported(void)
int upower_read(int battery, apm_info *info) int upower_read(int battery, apm_info *info)
{ {
GPtrArray *devices = NULL; GPtrArray *devices = NULL;
static int retries = 0;
up = up_client_new(); up = up_client_new();
@ -87,9 +90,15 @@ int upower_read(int battery, apm_info *info)
devices = up_client_get_devices(up); devices = up_client_get_devices(up);
if (!devices) if (!devices) {
return -1; retries++;
if (retries < MAX_RETRIES)
return 0; /* fine immediately after hibernation */
else
return -1;
}
retries = 0;
info->battery_flags = 0; info->battery_flags = 0;
info->using_minutes = 0; info->using_minutes = 0;