From c71bc63e7e2cbeafc98b3278c7826f72d591cbcf Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Mon, 28 Apr 2008 11:12:25 +0000
Subject: [PATCH] if we have apm as well on a new kernel - use that as it will
 probably take preference to power_supply class stuff

SVN revision: 34390
---
 src/modules/battery/batget.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/battery/batget.c b/src/modules/battery/batget.c
index 800d373ac..c376f9757 100644
--- a/src/modules/battery/batget.c
+++ b/src/modules/battery/batget.c
@@ -1348,7 +1348,8 @@ init(void)
 #elif defined(HAVE_CFBASE_H) /* OS X */
    darwin_init();
 #else
-   if (ecore_file_is_dir("/sys/class/power_supply")) /* >= 2.6.24 */
+   if ((ecore_file_is_dir("/sys/class/power_supply")) &&
+       (!ecore_file_exists("/proc/apm"))) /* >= 2.6.24 */
      {
 	mode = CHECK_SYS_CLASS_POWER_SUPPLY;
 	linux_sys_class_power_supply_init();