Merge branch 'master' into chaz

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index f4031f59591cf430edd1b93eaddcc7130c80536b..9295194e82048ee3b4548cd6c65661f5830a9939 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -305,6 +305,8 @@ gboolean screen_annex(void)
     supported[i++] = OBT_PROP_ATOM(OB_APP_TITLE);
     supported[i++] = OBT_PROP_ATOM(OB_APP_NAME);
     supported[i++] = OBT_PROP_ATOM(OB_APP_CLASS);
+    supported[i++] = OBT_PROP_ATOM(OB_APP_GROUP_NAME);
+    supported[i++] = OBT_PROP_ATOM(OB_APP_GROUP_CLASS);
     supported[i++] = OBT_PROP_ATOM(OB_APP_TYPE);
     g_assert(i == num_support);
 
@@ -1325,8 +1327,9 @@ typedef struct {
 static void get_xinerama_screens(Rect **xin_areas, guint *nxin)
 {
     guint i;
-    gint n, l, r, t, b;
+    gint l, r, t, b;
 #ifdef XINERAMA
+    gint n;
     XineramaScreenInfo *info;
 #endif