File hal-fix-acpi_on_battery_discharging.diff of Package hal

Overview Repositories Revisions Requests Users Attributes Meta

File hal-fix-acpi_on_battery_discharging.diff of Package hal (Revision 1cd469774a22680894658aa8e7a8cc8b)

Currently displaying revision 1cd469774a22680894658aa8e7a8cc8b , Show latest

--- a/hald/device_pm.c
+++ b/hald/device_pm.c
@@ -32,6 +32,7 @@
 
 #include <glib.h>
 
+#include "hald.h"
 #include "logger.h"
 #include "util_pm.h"
 #include "device_pm.h"
@@ -208,8 +208,55 @@ battery_refresh_poll (HalDevice *d)
 	charging = hal_device_property_get_bool (d, "battery.rechargeable.is_charging");
 	discharging = hal_device_property_get_bool (d, "battery.rechargeable.is_discharging");
 
-	if (!charging && !discharging)
-		normalised_rate = 0;
+	if (!charging && !discharging) {
+	        GSList *i;
+	        GSList *devices;
+        	HalDevice *_d;
+		gboolean online;
+		gboolean is_discharing;
+		const char *bat_type;
+
+		online = FALSE;
+		is_discharing = FALSE;
+
+		/* check if the machine is on AC or on battery */ 
+        	devices = hal_device_store_match_multiple_key_value_string (hald_get_gdl (),
+                                                                            "info.category",
+                       		                                            "ac_adapter");
+        	for (i = devices; i != NULL; i = g_slist_next (i)) {
+                	_d = HAL_DEVICE (i->data);
+                	if (hal_device_has_property (_d, "linux.acpi_type")) {
+				if (hal_device_property_get_bool (_d, "ac_adapter.present")) {
+					online = TRUE; 
+				}
+                	}
+        	}
+        	g_slist_free (devices);
+
+		if (online) {
+			normalised_rate = 0;
+		} else {
+			/* check if there is an other battery already discharing, if so: set normalised_rate = 0 */ 
+			devices = hal_device_store_match_multiple_key_value_string (hald_get_gdl (),
+        	                                                                    "info.category",
+                	                                                            "battery");
+			for (i = devices; i != NULL; i = g_slist_next (i)) {
+	                        _d = HAL_DEVICE (i->data);
+        	                if (hal_device_has_property (_d, "linux.acpi_type")) {
+					bat_type = hal_device_property_get_string (_d, "battery.type");
+                	                if (bat_type != NULL && !strncmp (bat_type, "primary", 7)) {
+                                		if (strcmp (hal_device_get_udi(d), hal_device_get_udi(_d)) != 0) {
+							if (hal_device_property_get_bool (_d, "battery.rechargeable.is_discharging"))
+								is_discharing = TRUE;
+						}	
+					}
+                       		}
+                	}
+
+			if (is_discharing)
+				normalised_rate = 0;
+		}
+	}
 
 	/*
 	 * Some laptops report current charge much larger than

Places

File hal-fix-acpi_on_battery_discharging.diff of Package hal (Revision 1cd469774a22680894658aa8e7a8cc8b)

Places