[mutter/wayland] window: Fix meta_window_ping some more
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] window: Fix meta_window_ping some more
- Date: Sat, 7 Dec 2013 01:23:20 +0000 (UTC)
commit ee683ff187463350cf794ff77e2c3809b13ccbcd
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Dec 6 20:23:00 2013 -0500
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.
src/core/window.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/src/core/window.c b/src/core/window.c
index 3a3fde0..e13e0a7 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -12231,9 +12231,6 @@ meta_window_pong (MetaWindow *window,
ping_data->timestamp,
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);
break;
@@ -12333,6 +12330,8 @@ meta_window_ping (MetaWindow *window,
ping_data->user_data = user_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);
meta_topic (META_DEBUG_PING,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]