merge autotool build system by Christian Ruppert

[chaz/tint2] / src / panel.c

diff --git a/src/panel.c b/src/panel.c
index 7d0fa90488c9de043d131f8d8f6613938aa331e4..e202f816950ac80dbdbb9601ce5f7910596cf4d2 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -40,11 +40,13 @@ int mouse_scroll_up;
 int mouse_scroll_down;
 
 int panel_mode;
+int wm_menu;
 int panel_position;
 int panel_refresh;
 
-Task *task_active = 0;
-Task *task_drag = 0;
+Task *task_active;
+Task *task_drag;
+Task *task_urgent;
 
 Panel *panel1 = 0;
 int  nb_panel;
@@ -136,6 +138,9 @@ void cleanup_panel()
 {
        if (!panel1) return;
 
+       task_active = 0;
+       task_drag = 0;
+       task_urgent = 0;
        cleanup_systray();
    cleanup_taskbar();
 
@@ -249,8 +254,8 @@ void set_panel_properties(Panel *p)
    }
 
    // Dock
-   long val = server.atom._NET_WM_WINDOW_TYPE_DOCK;
-   XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1);
+   //long val = server.atom._NET_WM_WINDOW_TYPE_DOCK;
+   //XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_WINDOW_TYPE, XA_ATOM, 32, PropModeReplace, (unsigned char *) &val, 1);
 
    // Reserved space
    long   struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -271,7 +276,7 @@ void set_panel_properties(Panel *p)
    XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_STRUT_PARTIAL, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &struts, 12);
 
    // Sticky and below other window
-   val = 0xFFFFFFFF;
+   long val = 0xFFFFFFFF;
    XChangeProperty (server.dsp, p->main_win, server.atom._NET_WM_DESKTOP, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &val, 1);
    Atom state[4];
    state[0] = server.atom._NET_WM_STATE_SKIP_PAGER;