From 624ffe397bb52757f486208b754489cdb77fd923 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 9 Jul 2010 20:58:21 -0700
Subject: [PATCH] Revert "add XFlush to g_timeout callbacks"

This reverts commit aa3685d16af4a565eecdc39047ee8d140ef5cd99.

Mika's commit using a GSource to handle X Events fixes this problem, so this
commit is not needed
---
 openbox/dock.c          | 2 --
 openbox/event.c         | 2 --
 openbox/frame.c         | 3 +--
 openbox/keyboard.c      | 1 -
 openbox/menuframe.c     | 2 --
 openbox/moveresize.c    | 3 ---
 openbox/ping.c          | 1 -
 openbox/popup.c         | 1 -
 openbox/screen.c        | 1 -
 openbox/startupnotify.c | 2 --
 10 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/openbox/dock.c b/openbox/dock.c
index b8a5ff5..06d2280 100644
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -632,7 +632,6 @@ static gboolean hide_timeout(gpointer data)
 
     hide_timeout_id = 0;
 
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 
@@ -644,7 +643,6 @@ static gboolean show_timeout(gpointer data)
 
     show_timeout_id = 0;
 
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 
diff --git a/openbox/event.c b/openbox/event.c
index eb69d09..b59707b 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -2073,7 +2073,6 @@ static gboolean focus_delay_func(gpointer data)
     if (client_focus(d->client) && config_focus_raise)
         stacking_raise(CLIENT_AS_WINDOW(d->client));
     event_curtime = old;
-    XFlush(obt_display);
     return FALSE; /* no repeat */
 }
 
@@ -2086,7 +2085,6 @@ static gboolean unfocus_delay_func(gpointer data)
     event_curserial = d->serial;
     focus_nothing();
     event_curtime = old;
-    XFlush(obt_display);
     return FALSE; /* no repeat */
 }
 
diff --git a/openbox/frame.c b/openbox/frame.c
index bd9527b..8a9a5a6 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -1672,7 +1672,6 @@ static gboolean flash_timeout(gpointer data)
         self->focused = FALSE;
     }
 
-    XFlush(obt_display);
     return TRUE; /* go again */
 }
 
@@ -1770,11 +1769,11 @@ static gboolean frame_animate_iconify(gpointer p)
     }
 
     XMoveResizeWindow(obt_display, self->window, x, y, w, h);
+    XFlush(obt_display);
 
     if (time == 0)
         frame_end_iconify_animation(self);
 
-    XFlush(obt_display);
     return time > 0; /* repeat until we're out of time */
 }
 
diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 95433ac..5b8016d 100644
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -66,7 +66,6 @@ static void grab_keys(gboolean grab)
 static gboolean chain_timeout(gpointer data)
 {
     keyboard_reset_chains(0);
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index fafc0f7..5708cdf 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -1158,7 +1158,6 @@ static gboolean submenu_show_timeout(gpointer data)
 {
     g_assert(menu_frame_visible);
     menu_entry_frame_show_submenu((ObMenuEntryFrame*)data);
-    XFlush(obt_display);
     return FALSE;
 }
 
@@ -1166,7 +1165,6 @@ static gboolean submenu_hide_timeout(gpointer data)
 {
     g_assert(menu_frame_visible);
     menu_frame_hide((ObMenuFrame*)data);
-    XFlush(obt_display);
     return FALSE;
 }
 
diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 13f39df..2f68395 100644
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -462,8 +462,6 @@ static gboolean sync_timeout_func(gpointer data)
     ++waiting_for_sync; /* we timed out waiting for our sync... */
     do_resize(); /* ...so let any pending resizes through */
 
-    XFlush(obt_display);
-
     if (waiting_for_sync > SYNC_TIMEOUTS) {
         sync_timer = 0;
         return FALSE; /* don't repeat */
@@ -618,7 +616,6 @@ static gboolean edge_warp_delay_func(gpointer data)
     }
     edge_warp_odd = !edge_warp_odd;
 
-    XFlush(obt_display);
     return TRUE; /* do repeat ! */
 }
 
diff --git a/openbox/ping.c b/openbox/ping.c
index 90c4182..7cb4766 100644
--- a/openbox/ping.c
+++ b/openbox/ping.c
@@ -148,7 +148,6 @@ static gboolean ping_timeout(gpointer data)
 
     ++t->waiting;
 
-    XFlush(obt_display);
     return TRUE; /* repeat */
 }
 
diff --git a/openbox/popup.c b/openbox/popup.c
index 6dd0e30..2a83d7b 100644
--- a/openbox/popup.c
+++ b/openbox/popup.c
@@ -148,7 +148,6 @@ static gboolean popup_show_timeout(gpointer data)
     self->delay_mapped = FALSE;
     self->delay_timer = 0;
 
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 
diff --git a/openbox/screen.c b/openbox/screen.c
index e3ad861..353d2de 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -940,7 +940,6 @@ static gboolean hide_desktop_popup_func(gpointer data)
 {
     pager_popup_hide(desktop_popup);
     desktop_popup_timer = 0;
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 
diff --git a/openbox/startupnotify.c b/openbox/startupnotify.c
index 06fbb6c..16654cf 100644
--- a/openbox/startupnotify.c
+++ b/openbox/startupnotify.c
@@ -116,7 +116,6 @@ static gboolean sn_wait_timeout(gpointer data)
     SnStartupSequence *seq = data;
     sn_waits = g_slist_remove(sn_waits, seq);
     screen_set_root_cursor();
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 
@@ -229,7 +228,6 @@ static gboolean sn_launch_wait_timeout(gpointer data)
 {
     SnLauncherContext *sn = data;
     sn_launcher_context_complete(sn);
-    XFlush(obt_display);
     return FALSE; /* don't repeat */
 }
 
-- 
1.9.1