Merge branch 'backport' into work

Diffing against the old work branch where most of the changes
in backport were cherry-picked from indicates this should be
alright. (0de9097017d4d1991388a35e380a57dc1135b431)

1 files changed, 1 insertions, 1 deletions

diff --git a/openbox/geom.h b/openbox/geom.h
index bdcd3c55..7c5ee32e 100644
--- a/openbox/geom.h
+++ b/openbox/geom.h
@@ -23,7 +23,7 @@
 #include <glib.h>
 
 typedef struct _GravityCoord {
-    int pos;
+    gint pos;
     gboolean center;
     gboolean opposite;
 } GravityCoord;