all repos — tint2 @ a081c0a57d71f510e33c97673a417a0223354375

fork of the tint2 desktop panel for my custom setup - only minimized windows across all desktops for the taskbar 

issue 87 : another try

git-svn-id: http://tint2.googlecode.com/svn/trunk@80 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
lorthiois@bbsoft.fr lorthiois@bbsoft.fr@121b4492-b84c-0410-8b4c-0d4edfb3f3cc
commit

a081c0a57d71f510e33c97673a417a0223354375

parent

e43bf23b670a9f731f1248405951ba4036586cd4

2 files changed, 19 insertions(+), 2 deletions(-)

jump to
M src/battery/battery.c → src/battery/battery.c 
@@ -140,10 +140,27 @@ g_free(path1);
 		}
 	}
 	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;