summaryrefslogtreecommitdiff
path: root/openbox/frame.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2010-07-09 20:58:21 -0700
committerMikael Magnusson <mikachu@gmail.com>2010-09-16 17:24:12 +0200
commit624ffe397bb52757f486208b754489cdb77fd923 (patch)
tree4964c52bcc82095f59b24d2d05e58de035670a20 /openbox/frame.c
parent179312f9ae8ad3fdae977ac0d4004aa6ef33f5eb (diff)
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
Diffstat (limited to 'openbox/frame.c')
-rw-r--r--openbox/frame.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/openbox/frame.c b/openbox/frame.c
index bd9527b0..8a9a5a64 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 */
}