mirror of
https://github.com/brl/mutter.git
synced 2024-11-11 00:26:40 -05:00
window: Fix meta_window_ping some more
Make sure to actually add the pings to the list... and don't remove it from the list twice.
This commit is contained in:
parent
57602adfe7
commit
ee683ff187
@ -12231,9 +12231,6 @@ meta_window_pong (MetaWindow *window,
|
|||||||
ping_data->timestamp,
|
ping_data->timestamp,
|
||||||
ping_data->user_data);
|
ping_data->user_data);
|
||||||
|
|
||||||
/* Remove the ping data from the list */
|
|
||||||
window->pending_pings = g_slist_remove (window->pending_pings, ping_data);
|
|
||||||
|
|
||||||
ping_data_free (ping_data);
|
ping_data_free (ping_data);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
@ -12333,6 +12330,8 @@ meta_window_ping (MetaWindow *window,
|
|||||||
ping_data->user_data = user_data;
|
ping_data->user_data = user_data;
|
||||||
ping_data->ping_timeout_id = g_timeout_add (PING_TIMEOUT_DELAY, ping_timeout, ping_data);
|
ping_data->ping_timeout_id = g_timeout_add (PING_TIMEOUT_DELAY, ping_timeout, ping_data);
|
||||||
|
|
||||||
|
window->pending_pings = g_slist_prepend (window->pending_pings, ping_data);
|
||||||
|
|
||||||
g_hash_table_insert (display->pending_pings, &ping_data->timestamp, window);
|
g_hash_table_insert (display->pending_pings, &ping_data->timestamp, window);
|
||||||
|
|
||||||
meta_topic (META_DEBUG_PING,
|
meta_topic (META_DEBUG_PING,
|
||||||
|
Loading…
Reference in New Issue
Block a user