From: Slavek Banko <slavek.banko@axis.cz>
Date: Tue, 25 Jul 2006 19:57:01 +0000 (+0200)
Subject: opie-batteryapplet: fix battery status for iPAQs running Linux 2.6
X-Git-Tag: familiar-v0.8.4-rc3~4
X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=324445b861576465296ef56a3d50ebf8a82f52ca;p=familiar-h63xx-build.git

opie-batteryapplet: fix battery status for iPAQs running Linux 2.6

Signed-off-by: Rene Wagner <rw@handhelds.org>
---

diff --git a/org.handhelds.familiar/packages/opie-batteryapplet/files/iPaq-2.6-batteryapplet.patch b/org.handhelds.familiar/packages/opie-batteryapplet/files/iPaq-2.6-batteryapplet.patch
new file mode 100644
index 0000000..b56e2c3
--- /dev/null
+++ b/org.handhelds.familiar/packages/opie-batteryapplet/files/iPaq-2.6-batteryapplet.patch
@@ -0,0 +1,16 @@
+diff -aruN batteryapplet.orig/batterystatus.cpp batteryapplet/batterystatus.cpp
+--- batteryapplet.orig/batterystatus.cpp	2005-06-14 20:14:38.000000000 +0200
++++ batteryapplet/batterystatus.cpp	2006-05-28 23:56:44.000000000 +0200
+@@ -81,11 +81,9 @@
+                 }
+             }
+         }
+-    } else {
+-        QMessageBox::warning(this, tr("Failure"),tr("could not open file"));
++	procApmIpaq.close();
+     }
+ 
+-    procApmIpaq.close();
+     jackPercent = perc2.toInt();
+     ipaqPercent = perc1.toInt();
+ 
diff --git a/org.handhelds.familiar/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb b/org.handhelds.familiar/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb
index 3feba24..501ff32 100644
--- a/org.handhelds.familiar/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb
+++ b/org.handhelds.familiar/packages/opie-batteryapplet/opie-batteryapplet_1.2.1.bb
@@ -1,7 +1,8 @@
 include ${PN}.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/applets/batteryapplet \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
-           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps"
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
+	   file://iPaq-2.6-batteryapplet.patch;patch=1"