merge r6066 from trunk

diff --git a/openbox/frame.c b/openbox/frame.c
index 8092e6c601347919fcd3098924d6ded7ea6de148..38bbde18e429f0d5613f2e8ddf751f060aea0e5c 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -42,7 +42,7 @@
 #define INNER_EVENTMASK (ButtonPressMask)
 
 #define FRAME_ANIMATE_ICONIFY_STEPS 20
-#define FRAME_ANIMATE_ICONIFY_TIME (G_USEC_PER_SEC/10)
+#define FRAME_ANIMATE_ICONIFY_TIME (G_USEC_PER_SEC/5)
 
 #define FRAME_HANDLE_Y(f) (f->innersize.top + f->client->area.height + \
                            f->cbwidth_y)