diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-17 09:19:16 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2005-07-17 09:19:16 +0800 |
| commit | d6e436497037d7c209ca8df9919bc092662bb28d (patch) | |
| tree | 31134fbaf33617fe661906d8103f23ab30d03ad6 | |
| parent | 71babc1ceef809171adc0c00cf1537405fb51677 (diff) | |
| download | marcuscom-ports-d6e436497037d7c209ca8df9919bc092662bb28d.tar marcuscom-ports-d6e436497037d7c209ca8df9919bc092662bb28d.tar.gz marcuscom-ports-d6e436497037d7c209ca8df9919bc092662bb28d.tar.bz2 marcuscom-ports-d6e436497037d7c209ca8df9919bc092662bb28d.tar.lz marcuscom-ports-d6e436497037d7c209ca8df9919bc092662bb28d.tar.xz marcuscom-ports-d6e436497037d7c209ca8df9919bc092662bb28d.tar.zst marcuscom-ports-d6e436497037d7c209ca8df9919bc092662bb28d.zip | |
Fix a typo in battstat on amd64.
Reported by: GNOME Tinderbox
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4261 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/gnome-applets/files/patch-battstat_power-management.c | 18 | ||||
| -rw-r--r-- | x11/gnomeapplets2/files/patch-battstat_power-management.c | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/x11/gnome-applets/files/patch-battstat_power-management.c b/x11/gnome-applets/files/patch-battstat_power-management.c index ab70e5be4..8254969f8 100644 --- a/x11/gnome-applets/files/patch-battstat_power-management.c +++ b/x11/gnome-applets/files/patch-battstat_power-management.c @@ -1,6 +1,6 @@ ---- battstat/power-management.c.orig Sun Jul 3 16:55:38 2005 -+++ battstat/power-management.c Sun Jul 3 17:02:43 2005 -@@ -191,16 +191,40 @@ apm_readinfo (BatteryStatus *status) +--- battstat/power-management.c.orig Mon Jul 4 09:41:04 2005 ++++ battstat/power-management.c Sat Jul 16 21:17:05 2005 +@@ -173,16 +173,40 @@ apm_readinfo (BatteryStatus *status) #elif __FreeBSD__ @@ -41,7 +41,7 @@ static const char * apm_readinfo (BatteryStatus *status) { -@@ -208,21 +232,27 @@ apm_readinfo (BatteryStatus *status) +@@ -190,21 +214,27 @@ apm_readinfo (BatteryStatus *status) if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); @@ -77,17 +77,17 @@ fd = open(APMDEVICE, O_RDONLY); if (fd == -1) { return ERR_OPEN_APMDEV; -@@ -236,6 +266,9 @@ apm_readinfo (BatteryStatus *status) +@@ -217,6 +247,9 @@ apm_readinfo (BatteryStatus *status) + if(apminfo.ai_status == 0) return ERR_APM_E; - } +#else + return ERR_OPEN_APMDEV; +#endif + } status->present = TRUE; - status->on_ac_power = apminfo.ai_acline ? 1 : 0; -@@ -480,6 +513,12 @@ power_management_initialise( void ) +@@ -476,6 +509,12 @@ power_management_initialise( void ) } else using_acpi = FALSE; @@ -100,7 +100,7 @@ #endif pm_initialised = 1; -@@ -504,6 +543,9 @@ power_management_cleanup( void ) +@@ -509,6 +548,9 @@ power_management_cleanup( void ) } #elif defined(__FreeBSD__) if (using_acpi) { diff --git a/x11/gnomeapplets2/files/patch-battstat_power-management.c b/x11/gnomeapplets2/files/patch-battstat_power-management.c index ab70e5be4..8254969f8 100644 --- a/x11/gnomeapplets2/files/patch-battstat_power-management.c +++ b/x11/gnomeapplets2/files/patch-battstat_power-management.c @@ -1,6 +1,6 @@ ---- battstat/power-management.c.orig Sun Jul 3 16:55:38 2005 -+++ battstat/power-management.c Sun Jul 3 17:02:43 2005 -@@ -191,16 +191,40 @@ apm_readinfo (BatteryStatus *status) +--- battstat/power-management.c.orig Mon Jul 4 09:41:04 2005 ++++ battstat/power-management.c Sat Jul 16 21:17:05 2005 +@@ -173,16 +173,40 @@ apm_readinfo (BatteryStatus *status) #elif __FreeBSD__ @@ -41,7 +41,7 @@ static const char * apm_readinfo (BatteryStatus *status) { -@@ -208,21 +232,27 @@ apm_readinfo (BatteryStatus *status) +@@ -190,21 +214,27 @@ apm_readinfo (BatteryStatus *status) if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); @@ -77,17 +77,17 @@ fd = open(APMDEVICE, O_RDONLY); if (fd == -1) { return ERR_OPEN_APMDEV; -@@ -236,6 +266,9 @@ apm_readinfo (BatteryStatus *status) +@@ -217,6 +247,9 @@ apm_readinfo (BatteryStatus *status) + if(apminfo.ai_status == 0) return ERR_APM_E; - } +#else + return ERR_OPEN_APMDEV; +#endif + } status->present = TRUE; - status->on_ac_power = apminfo.ai_acline ? 1 : 0; -@@ -480,6 +513,12 @@ power_management_initialise( void ) +@@ -476,6 +509,12 @@ power_management_initialise( void ) } else using_acpi = FALSE; @@ -100,7 +100,7 @@ #endif pm_initialised = 1; -@@ -504,6 +543,9 @@ power_management_cleanup( void ) +@@ -509,6 +548,9 @@ power_management_cleanup( void ) } #elif defined(__FreeBSD__) if (using_acpi) { |