From: Thierry Lorthiois <lorthiois@bbsoft.fr>
Date: Sat, 16 May 2009 15:23:20 +0000 (+0000)
Subject: fixed issue 84 with battery
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;ds=sidebyside;h=2396d9cb9b913ae92e6ea4091e80fb2347d736a0;p=chaz%2Ftint2

fixed issue 84 with battery
---

diff --git a/src/battery/battery.c b/src/battery/battery.c
index a0b122d..7bd6f94 100644
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -54,27 +54,27 @@ void update_battery(struct batstate *data) {
 		fgets(tmp, sizeof tmp, fp);
 		energy_now = atoi(tmp);
 		fclose(fp);
-	} else printf("ERROR: battery applet can't open energy_now\n");
+	}
 
 	fp = fopen("/sys/class/power_supply/BAT0/energy_full", "r");
 	if(fp != NULL) {
 		fgets(tmp, sizeof tmp, fp);
 		energy_full = atoi(tmp);
 		fclose(fp);
-	} else printf("ERROR: battery applet can't open energy_full\n");
+	}
 
 	fp = fopen("/sys/class/power_supply/BAT0/current_now", "r");
 	if(fp != NULL) {
 		fgets(tmp, sizeof tmp, fp);
 		current_now = atoi(tmp);
 		fclose(fp);
-	} else printf("ERROR: battery applet can't open current_now\n");
+	}
 
 	fp = fopen("/sys/class/power_supply/BAT0/status", "r");
 	if(fp != NULL) {
 		fgets(tmp, sizeof tmp, fp);
 		fclose(fp);
-	} else printf("ERROR: battery applet can't open status");
+	}
 
 	data->state = BATTERY_UNKNOWN;
 	if(strcasecmp(tmp, "Charging\n")==0) data->state = BATTERY_CHARGING;
@@ -110,8 +110,10 @@ void update_battery(struct batstate *data) {
 	data->percentage = new_percentage;
 }
 
+
 void init_battery()
 {
+	FILE *fp;
    Panel *panel;
    Battery *battery;
    int i, bat_percentage_height, bat_percentage_height_ink, bat_time_height, bat_time_height_ink;
@@ -126,6 +128,30 @@ void init_battery()
 		battery->area._resize = resize_battery;
 
 		if (!battery->area.on_screen) continue;
+		if((fp = fopen("/sys/class/power_supply/BAT0/energy_now", "r")) == NULL) {
+			fprintf(stderr, "ERROR: battery applet can't open energy_now\n");
+			panel->battery.area.on_screen = 0;
+			continue;
+		}
+		fclose(fp);
+		if((fp = fopen("/sys/class/power_supply/BAT0/energy_full", "r")) == NULL) {
+			fprintf(stderr, "ERROR: battery applet can't open energy_full\n");
+			panel->battery.area.on_screen = 0;
+			continue;
+		}
+		fclose(fp);
+		if((fp = fopen("/sys/class/power_supply/BAT0/current_now", "r")) == NULL) {
+			fprintf(stderr, "ERROR: battery applet can't open current_now\n");
+			panel->battery.area.on_screen = 0;
+			continue;
+		}
+		fclose(fp);
+		if((fp = fopen("/sys/class/power_supply/BAT0/status", "r")) == NULL) {
+			fprintf(stderr, "ERROR: battery applet can't open status");
+			panel->battery.area.on_screen = 0;
+			continue;
+		}
+		fclose(fp);
 
 		battery->area.posy = panel->area.pix.border.width + panel->area.paddingy;
 		battery->area.height = panel->area.height - (2 * battery->area.posy);
diff --git a/src/tint.c b/src/tint.c
index afb83cb..f1c0356 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -468,7 +468,8 @@ void event_timer()
    if (abs(stv.tv_sec - time_clock.tv_sec) < time_precision) return;
 
 	// update battery
-	update_battery(&battery_state);
+	if (panel1[0].battery.area.on_screen)
+		update_battery(&battery_state);
 
 	// update clock
 	time_clock.tv_sec = stv.tv_sec;
diff --git a/src/tint2 b/src/tint2
index e1830e3..7e1ff5e 100755
Binary files a/src/tint2 and b/src/tint2 differ