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
This commit is contained in:
parent
10dfee6476
commit
123c8bef7d
2 changed files with 6 additions and 2 deletions
|
@ -104,6 +104,7 @@ void init_launcher_panel(void *p)
|
||||||
void cleanup_launcher()
|
void cleanup_launcher()
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
GSList *l;
|
||||||
|
|
||||||
if (xsettings_client)
|
if (xsettings_client)
|
||||||
xsettings_client_destroy(xsettings_client);
|
xsettings_client_destroy(xsettings_client);
|
||||||
|
@ -112,7 +113,10 @@ void cleanup_launcher()
|
||||||
Launcher *launcher = &panel->launcher;
|
Launcher *launcher = &panel->launcher;
|
||||||
cleanup_launcher_theme(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;
|
panel_config.launcher.list_apps = NULL;
|
||||||
free(icon_theme_name);
|
free(icon_theme_name);
|
||||||
icon_theme_name = 0;
|
icon_theme_name = 0;
|
||||||
|
|
|
@ -199,7 +199,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);
|
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;
|
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;
|
event_mask |= PointerMotionMask|LeaveWindowMask;
|
||||||
if (panel_autohide)
|
if (panel_autohide)
|
||||||
event_mask |= LeaveWindowMask|EnterWindowMask;
|
event_mask |= LeaveWindowMask|EnterWindowMask;
|
||||||
|
|
Loading…
Reference in a new issue