*add* remove of tooltip = En/Disabled. it's renamed to task_tooltip to enable/disable...

[chaz/tint2] / src / panel.c

diff --git a/src/panel.c b/src/panel.c
index 9b52aae3768f3b4e8d848a6b3adc09b0fe3ae271..b99ffa56e576cb078c9cbfd440646615f8addc5e 100644 (file)
--- a/src/panel.c
+++ b/src/panel.c
@@ -105,6 +105,8 @@ void cleanup_panel()
        if (!panel1) return;
 
        cleanup_taskbar();
+       // taskbarname_font_desc freed here because cleanup_taskbarname() called on _NET_NUMBER_OF_DESKTOPS
+       if (taskbarname_font_desc)      pango_font_description_free(taskbarname_font_desc);
 
        int i;
        Panel *p;
@@ -196,7 +198,7 @@ void init_panel()
                p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, server.visual, mask, &att);
 
                long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask|ButtonMotionMask;
-               if (g_tooltip.enabled)
+               if (p->g_task.tooltip_enabled || p->clock.area._get_tooltip_text)
                        event_mask |= PointerMotionMask|LeaveWindowMask;
                if (panel_autohide)
                        event_mask |= LeaveWindowMask|EnterWindowMask;
@@ -535,8 +537,11 @@ void set_panel_background(Panel *p)
                for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
                        if (tskbar->state_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]);
                        tskbar->state_pix[k] = 0;
+                       if (tskbar->bar_name.state_pix[k]) XFreePixmap(server.dsp, tskbar->bar_name.state_pix[k]);
+                       tskbar->bar_name.state_pix[k] = 0;
                }
                tskbar->area.pix = 0;
+               tskbar->bar_name.area.pix = 0;
                l0 = tskbar->area.list;
                if (taskbarname_enabled) l0 = l0->next;
                for (; l0 ; l0 = l0->next) {