[Pkg-e-commits] [SCM] Enlightenment 17 branch, upstream-vcs, updated. a8698069ec4eec9c2a189198fa5eec9854b168ac

[raster]

The following commit has been merged in the upstream-vcs branch:
commit 8c4f31c3a01e5fa029299001096a170e2a407317
Author: raster <raster>
Date:   Mon Apr 28 11:12:25 2008 +0000

    if we have apm as well on a new kernel - use that as it will probably take
    preference to power_supply class stuff

diff --git a/src/modules/battery/batget.c b/src/modules/battery/batget.c
index 800d373..c376f97 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();

-- 
Enlightenment 17