Disable mouse hover events when the launcher tooltip is disabled Do not use g_slist_free_full since it requires glib 2.28 git-svn-id: http://tint2.googlecode.com/svn/trunk@645 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
o9000 o9000
2 files changed,
6 insertions(+),
2 deletions(-)
M
src/launcher/launcher.c
→
src/launcher/launcher.c
@@ -104,6 +104,7 @@
void cleanup_launcher() { int i; + GSList *l; if (xsettings_client) xsettings_client_destroy(xsettings_client);@@ -112,7 +113,10 @@ Panel *panel = &panel1[i];
Launcher *launcher = &panel->launcher; cleanup_launcher_theme(launcher); } - g_slist_free_full(panel_config.launcher.list_apps, free); + for (l = panel_config.launcher.list_apps; l ; l = l->next) { + free(l->data); + } + g_slist_free(panel_config.launcher.list_apps); panel_config.launcher.list_apps = NULL; free(icon_theme_name); icon_theme_name = 0;
M
src/panel.c
→
src/panel.c
@@ -199,7 +199,7 @@ unsigned long mask = CWEventMask|CWColormap|CWBackPixel|CWBorderPixel;
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 (p->g_task.tooltip_enabled || p->clock.area._get_tooltip_text || p->launcher.area.on_screen) + if (p->g_task.tooltip_enabled || p->clock.area._get_tooltip_text || (launcher_enabled && launcher_tooltip_enabled)) event_mask |= PointerMotionMask|LeaveWindowMask; if (panel_autohide) event_mask |= LeaveWindowMask|EnterWindowMask;