Commit 82dce675 authored by Jasper St. Pierre's avatar Jasper St. Pierre
Browse files

window: Remove pending pings in unmanage



This makes sure that we see them for Wayland clients as well, and don't
time out and crash when we're accessing an invalid window / surface.
Spotted-by: Rui Matos's avatarRui Matos <tiagomatos@gmail.com>
parent 024652bf
......@@ -445,6 +445,9 @@ void meta_display_sanity_check_timestamps (MetaDisplay *display,
gboolean meta_display_timestamp_too_old (MetaDisplay *display,
guint32 *timestamp);
void meta_display_remove_pending_pings_for_window (MetaDisplay *display,
MetaWindow *window);
MetaGestureTracker * meta_display_get_gesture_tracker (MetaDisplay *display);
#endif
......@@ -296,16 +296,9 @@ ping_data_free (MetaPingData *ping_data)
g_free (ping_data);
}
/**
* remove_pending_pings_for_window:
* @display: The display the window appears on
* @xwindow: The X ID of the window whose pings we should remove
*
* Frees every pending ping structure for the given X window on the
* given display. This means that we also destroy the timeouts.
*/
static void
remove_pending_pings_for_window (MetaDisplay *display, Window xwindow)
void
meta_display_remove_pending_pings_for_window (MetaDisplay *display,
MetaWindow *window)
{
GSList *tmp;
GSList *dead;
......@@ -318,7 +311,7 @@ remove_pending_pings_for_window (MetaDisplay *display, Window xwindow)
{
MetaPingData *ping_data = tmp->data;
if (ping_data->window->xwindow == xwindow)
if (ping_data->window == window)
dead = g_slist_prepend (dead, ping_data);
}
......@@ -1613,9 +1606,6 @@ meta_display_unregister_x_window (MetaDisplay *display,
g_return_if_fail (g_hash_table_lookup (display->xids, &xwindow) != NULL);
g_hash_table_remove (display->xids, &xwindow);
/* Remove any pending pings */
remove_pending_pings_for_window (display, xwindow);
}
void
......
......@@ -1272,6 +1272,8 @@ meta_window_unmanage (MetaWindow *window,
meta_stack_thaw (window->screen->stack);
}
meta_display_remove_pending_pings_for_window (window->display, window);
meta_window_shutdown_group (window); /* safe to do this early as
* group.c won't re-add to the
* group if window->unmanaging
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment