X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fbattery%2Fbattery.c;h=f0bb1ff0a0749efa3cf24c583065d230c17e6b58;hb=ef9c33a6a77e304bceaa00b146869bf3747aaa57;hp=c07f072a8e11dd0ba7da2d4772d23f8043f6454e;hpb=851aebb17710a7c87163c09d9e1b2ea04458fcac;p=chaz%2Ftint2

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;