aboutsummaryrefslogtreecommitdiff
path: root/x11-wm/icewm/files/patch-ak
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/icewm/files/patch-ak')
-rw-r--r--x11-wm/icewm/files/patch-ak26
1 files changed, 13 insertions, 13 deletions
diff --git a/x11-wm/icewm/files/patch-ak b/x11-wm/icewm/files/patch-ak
index 88a64b028ff6..d678ae2be492 100644
--- a/x11-wm/icewm/files/patch-ak
+++ b/x11-wm/icewm/files/patch-ak
@@ -1,6 +1,6 @@
---- src/aapm.cc.orig Mon Jan 15 06:49:39 2001
-+++ src/aapm.cc Mon Jan 15 22:18:05 2001
-@@ -21,15 +21,32 @@
+--- src/aapm.cc.orig Tue Oct 9 23:54:03 2001
++++ src/aapm.cc Tue Feb 19 14:39:19 2002
+@@ -23,6 +23,13 @@
#include <string.h>
#include <stdio.h>
@@ -14,15 +14,9 @@
#ifdef CONFIG_APPLET_APM
YColor *YApm::apmBg = 0;
- YColor *YApm::apmFg = 0;
- YFont *YApm::apmFont = 0;
+@@ -32,8 +39,12 @@
+ extern YPixmap *taskbackPixmap;
-+#ifdef __FreeBSD__
-+#define APMDEV "/dev/apm"
-+#else
-+#define APMDEV "/proc/apm"
-+#endif
-+
void ApmStr(char *s, bool Tool) {
+#ifdef __FreeBSD__
+ struct apm_info ai;
@@ -34,7 +28,7 @@
char driver[16];
char apmver[16];
int apmflags;
-@@ -41,9 +58,27 @@
+@@ -45,9 +56,27 @@
char units[16];
if (fd == -1) {
@@ -63,10 +57,16 @@
len = read(fd, buf, sizeof(buf) - 1);
close(fd);
-@@ -61,6 +96,7 @@
+@@ -61,10 +90,11 @@
+ static int error = 1;
+ if (error) {
+ error = 0;
+- warn(_("/proc/apm - unknown format (%d)"), i);
++ warn(_("%s - unknown format (%d)"), APMDEV, i);
}
return ;
}
+#endif
if (BATlife == -1)
BATlife = 0;
+