--Multipart_Tue_May__1_01:50:12_2007-1
Content-Type: text/plain; charset=US-ASCII

Hello,

At Wed, 25 Apr 2007 11:29:42 +0300,
Martti Kuparinen wrote:
> 
> Kouichirou Hiratsuka wrote:
> > I have a xfce4-battery-plugin.  It works fine on NetBSD-current/i386
> > with ACPI apm emulation.
> 
> Thank you very much!
> 
> I've imported this into pkgsrc-wip, please test this and let me know if this 
> works for you or not.

Thanks for importing it.  It works fine for me.
BTW, please update patch-aa.

 - Don't change behavior of remaining time on Linux and FreeBSD.
 - Don't print remaining percentage as `100%' if there are no
   batteries.

> I'm interested in results in NetBSD 3.1 and 4.0_BETA2 as I'm personally using 
> NetBSD 4.99.x.

I'll test it on 4.0_BETA2 this weekend.

best regards.
--
 Kouichirou Hiratsuka
   hira@po6.nsk.ne.jp


--Multipart_Tue_May__1_01:50:12_2007-1
Content-Type: application/octet-stream
Content-Disposition: attachment; filename="patch-aa"
Content-Transfer-Encoding: base64

JE5ldEJTRCQKCi0tLSBwYW5lbC1wbHVnaW4vYmF0dGVyeS5jLm9yaWcJMjAwNy0wMS0xOCAwMjo1
Njo1MS4wMDAwMDAwMDAgKzA5MDAKKysrIHBhbmVsLXBsdWdpbi9iYXR0ZXJ5LmMJMjAwNy0wNS0w
MSAwMTozMjo0OS4wMDAwMDAwMDAgKzA5MDAKQEAgLTM1LDYgKzM1LDcgQEAKICNpbmNsdWRlIDxz
eXMvaW9jdGwuaD4KICNpbmNsdWRlIDxtYWNoaW5lL2FwbXZhci5oPgogI2RlZmluZSBBUE1ERVZJ
Q0UgIi9kZXYvYXBtIgorI2RlZmluZSBfQUNQSV9BUE1fQkFUVF9VTktOT1dOIDB4ZmZmZiAvKiBm
cm9tIHN5cy9kZXYvYWNwaS9hY3BpX2FwbS5jICovCiAjZWxpZiBfX2xpbnV4X18KICNpbmNsdWRl
IDxsaWJhcG0uaD4KICNlbmRpZgpAQCAtMjA5LDcgKzIxMCw3IEBACiAgICAgICBiYXR0bW9uLT5t
ZXRob2QgPSBCTV9CUk9LRU47CiAgICAgICBmZCA9IG9wZW4oQVBNREVWSUNFLCBPX1JET05MWSk7
CiAgICAgICBpZiAoZmQgPT0gLTEpIHJldHVybiBGQUxTRTsKLSAgICAgICsgICAgICBpZiAoaW9j
dGwoZmQsIEFQTV9JT0NfR0VUUE9XRVIsICZhcG0pID09IC0xKSB7CisgICAgICBpZiAoaW9jdGwo
ZmQsIEFQTV9JT0NfR0VUUE9XRVIsICZhcG0pID09IC0xKSB7CiAgICAgICAgIGNsb3NlKGZkKTsK
ICAgICAgICAgICAgICByZXR1cm4gRkFMU0U7CiAgICAgfQpAQCAtMzAyLDEzICszMDMsMTYgQEAK
ICAgICAgIGJhdHRtb24tPm1ldGhvZCA9IEJNX0JST0tFTjsKICAgICAgIGZkID0gb3BlbihBUE1E
RVZJQ0UsIE9fUkRPTkxZKTsKICAgICAgIGlmIChmZCA9PSAtMSkgcmV0dXJuIFRSVUU7Ci0gICAg
ICBpZiAoaW9jdGwoZmQsIEFQTV9JT0NfR0VUUE9XRVIsICZhcG1pbmZvKSA9PSAtMSkKKyAgICAg
IGlmIChpb2N0bChmZCwgQVBNX0lPQ19HRVRQT1dFUiwgJmFwbSkgPT0gLTEpCiAgICAgICAgICAg
ICByZXR1cm4gVFJVRTsKICAgICAgIGNsb3NlKGZkKTsKICAgICAgIGNoYXJnZSA9IGFwbS5iYXR0
ZXJ5X2xpZmU7CiAgICAgICB0aW1lX3JlbWFpbmluZyA9IGFwbS5taW51dGVzX2xlZnQ7CiAgICAg
ICBhY2xpbmUgPSBhcG0uYWNfc3RhdGUgPyBUUlVFIDogRkFMU0U7CiAKKyAgICAgIGlmKGJhdHRt
b24tPnRpbWVvdXRpZCAhPSAwKSBnX3NvdXJjZV9yZW1vdmUoYmF0dG1vbi0+dGltZW91dGlkKTsK
KyAgICAgIGJhdHRtb24tPnRpbWVvdXRpZCA9IGdfdGltZW91dF9hZGQoMiAqIDEwMjQsCisgICAg
ICAgICAgICAgIChHU291cmNlRnVuYykgdXBkYXRlX2FwbV9zdGF0dXMsIGJhdHRtb24pOwogI2Vs
c2UKICAgICBzdHJ1Y3QgYXBtX2luZm8gYXBtOwogICAgIERCRyAoIlVwZGF0aW5nIGJhdHRlcnkg
c3RhdHVzLi4uIik7CkBAIC00NjAsNiArNDY0LDExIEBACiAKICAgICBpZihiYXR0bW9uLT5vcHRp
b25zLmRpc3BsYXlfcGVyY2VudGFnZSAmJiAhKGJhdHRtb24tPm9wdGlvbnMuaGlkZV93aGVuX2Z1
bGwgJiYgYWNsaW5lICYmIGNoYXJnZSA+PSA5OSkpewogICAgICAgICBndGtfd2lkZ2V0X3Nob3co
KEd0a1dpZGdldCAqKWJhdHRtb24tPmNoYXJnZSk7CisjaWYgZGVmaW5lZChfX05ldEJTRF9fKSB8
fCBkZWZpbmVkKF9fT3BlbkJTRF9fKQorCSBpZiAoYXBtLm5iYXR0ZXJ5ID09IDApCisgICAgICAg
ICAgICBnX3NucHJpbnRmKGJ1ZmZlciwgc2l6ZW9mKGJ1ZmZlciksIi0tJSUgIik7CisJIGVsc2UK
KyNlbmRpZgogICAgICAgICBnX3NucHJpbnRmKGJ1ZmZlciwgc2l6ZW9mKGJ1ZmZlciksIiVkJSUg
IiwgY2hhcmdlKTsKICAgICAgICAgZ3RrX2xhYmVsX3NldF90ZXh0KGJhdHRtb24tPmNoYXJnZSxi
dWZmZXIpOwogICAgIH0gZWxzZSB7CkBAIC00NzcsNiArNDg2LDExIEBACiAgICAgICAgIH0KIAog
ICAgICAgICBndGtfd2lkZ2V0X3Nob3coKEd0a1dpZGdldCAqKWFjdGl2ZV9sYWJlbCk7CisjaWYg
ZGVmaW5lZChfX05ldEJTRF9fKQorCSBpZiAoYWNsaW5lIHx8IHRpbWVfcmVtYWluaW5nID09IF9B
Q1BJX0FQTV9CQVRUX1VOS05PV04pCisgICAgICAgICAgICBnX3NucHJpbnRmKGJ1ZmZlciwgc2l6
ZW9mKGJ1ZmZlciksICItLTotLSIpOworCSBlbHNlCisjZW5kaWYKICAgICAgICAgZ19zbnByaW50
ZihidWZmZXIsIHNpemVvZihidWZmZXIpLCIlMDJkOiUwMmQgIix0aW1lX3JlbWFpbmluZy82MCx0
aW1lX3JlbWFpbmluZyU2MCk7CiAgICAgICAgIGd0a19sYWJlbF9zZXRfdGV4dChhY3RpdmVfbGFi
ZWwsYnVmZmVyKTsKIAo=

--Multipart_Tue_May__1_01:50:12_2007-1--