Merge branch 'backport' into work

Conflicts:

	openbox/client.c
	openbox/event.c
	openbox/mouse.c
	openbox/openbox.c
	openbox/prop.c
	openbox/prop.h
	openbox/screen.c
	parser/parse.c
	parser/parse.h

1 files changed, 3 insertions, 0 deletions

diff --git a/openbox/client.h b/openbox/client.h
index c66aaf0a..a27d37c6 100644
--- a/openbox/client.h
+++ b/openbox/client.h
@@ -304,6 +304,9 @@ struct _ObClient
 
     /*! Where the window should iconify to/from */
     Rect icon_geometry;
+
+    /*! A boolean used for algorithms which need to mark clients as visited */
+    gboolean visited;
 };
 
 extern GList      *client_list;