From: Thierry Lorthiois <lorthiois@bbsoft.fr>
Date: Sun, 31 May 2009 17:32:49 +0000 (+0000)
Subject: issue 87 : another try
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=3758f3ff944c1cbcb7d3f53e873dcccb3d9a3f90;p=chaz%2Ftint2

issue 87 : another try
---

diff --git a/src/battery/battery.c b/src/battery/battery.c
index c07f072..f0bb1ff 100644
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -140,10 +140,27 @@ void init_battery()
 		}
 	}
 	if (battery_dir != 0) {
-		path_energy_now = g_build_filename(battery_dir, "energy_now", NULL);
-		path_energy_full = g_build_filename(battery_dir, "energy_full", NULL);
+		char *path1 = g_build_filename(battery_dir, "energy_now", NULL);
+		if (g_file_test (path1, G_FILE_TEST_EXISTS)) {
+			path_energy_now = g_build_filename(battery_dir, "energy_now", NULL);
+			path_energy_full = g_build_filename(battery_dir, "energy_full", NULL);
+		}
+		else {
+			char *path2 = g_build_filename(battery_dir, "charge_now", NULL);
+			if (g_file_test (path2, G_FILE_TEST_EXISTS)) {
+				path_energy_now = g_build_filename(battery_dir, "charge_now", NULL);
+				path_energy_full = g_build_filename(battery_dir, "charge_full", NULL);
+			}
+			else {
+				g_free(battery_dir);
+				battery_dir = 0;
+				fprintf(stderr, "ERROR: can't found energy_* or charge_*\n");
+			}
+			g_free(path2);
+		}
 		path_current_now = g_build_filename(battery_dir, "current_now", NULL);
 		path_status = g_build_filename(battery_dir, "status", NULL);
+		g_free(path1);
 	}
 
 	FILE *fp;
diff --git a/src/tint2 b/src/tint2
index 5f9d235..b9e7d04 100755
Binary files a/src/tint2 and b/src/tint2 differ