Add preprocessor statements to check if battery support has been enabled before using...

[chaz/tint2] / src / tint.c

diff --git a/src/tint.c b/src/tint.c
index f88b57fd7f3cb7fb1e549d25fbca40f205ae45d2..357c180f4506b6b67c257be0885fa39d97d80212 100644 (file)
--- a/src/tint.c
+++ b/src/tint.c
@@ -59,7 +59,9 @@ void init (int argc, char *argv[])
        default_timeout();
        default_systray();
        memset(&server, 0, sizeof(Server_global));
+#ifdef ENABLE_BATTERY
        default_battery();
+#endif
        default_clock();
        default_taskbar();
        default_tooltip();
@@ -151,7 +153,6 @@ void cleanup()
 {
        cleanup_timeout();
        cleanup_systray();
-       stop_net();
        cleanup_panel();
        cleanup_tooltip();
        cleanup_clock();
@@ -839,8 +840,8 @@ start:
                                        case UnmapNotify:
                                        case DestroyNotify:
                                                if (e.xany.window == server.composite_manager) {
-                                                       // TODO: Stop real_transparency
-                                                       //signal_pending = SIGUSR2;
+                                                       // Stop real_transparency
+                                                       signal_pending = SIGUSR1;
                                                        break;
                                                }
                                                if (e.xany.window == g_tooltip.window || !systray.area.on_screen)
@@ -857,13 +858,11 @@ start:
                                                ev = &e.xclient;
                                                if (ev->data.l[1] == server.atom._NET_WM_CM_S0) {
                                                        if (ev->data.l[2] == None)
-                                                               // TODO: Stop real_transparency
-                                                               //signal_pending = SIGUSR2;
-                                                               ;
+                                                               // Stop real_transparency
+                                                               signal_pending = SIGUSR1;
                                                        else
-                                                               // TODO: Start real_transparency
-                                                               //signal_pending = SIGUSR2;
-                                                               ;
+                                                               // Start real_transparency
+                                                               signal_pending = SIGUSR1;
                                                }
                                                if (!systray.area.on_screen) break;
                                                if (e.xclient.message_type == server.atom._NET_SYSTEM_TRAY_OPCODE && e.xclient.format == 32 && e.xclient.window == net_sel_win) {
@@ -900,7 +899,7 @@ start:
                        if (signal_pending == SIGUSR1) {
                                // restart tint2
                                // SIGUSR1 used when : user's signal, composite manager stop/start or xrandr
-                               FD_CLR (x11_fd, &fdset);
+                               FD_CLR (x11_fd, &fdset); // not sure if needed
                                goto start;
                        }
                        else {