*fix* applied patch from issue 299

[chaz/tint2] / src / battery / battery.c

diff --git a/src/battery/battery.c b/src/battery/battery.c
index fd4d59b26be8612418840b840b90266a969a3bb6..faf27e9f5a1596a99ee065aac8650c4c0d452f59 100644 (file)
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -194,8 +194,14 @@ void init_battery()
                }
                g_free(path2);
        }
-       if (path_energy_now && path_energy_full) {
+
+       path_current_now = g_build_filename(battery_dir, "power_now", NULL);
+       if (!g_file_test (path_current_now, G_FILE_TEST_EXISTS)) {
+               g_free(path_current_now);
                path_current_now = g_build_filename(battery_dir, "current_now", NULL);
+       }
+
+       if (path_energy_now && path_energy_full) {
                path_status = g_build_filename(battery_dir, "status", NULL);
 
                // check file
@@ -237,6 +243,8 @@ void init_battery_panel(void *p)
        battery->area._draw_foreground = draw_battery;
        battery->area.size_mode = SIZE_BY_CONTENT;
        battery->area._resize = resize_battery;
+       battery->area.on_screen = 1;
+       battery->area.resize = 1;
 }