[mutter/wayland] Move MetaGroup to be X11-specific

[Jasper St. Pierre <jstpierre src gnome org>]

commit f940292cfe5a80290a5dae8a62e05fbcbab32a7f
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Tue Mar 18 21:22:58 2014 -0400

    Move MetaGroup to be X11-specific

 src/Makefile.am           |    4 +---
 src/core/stack.c          |    2 +-
 src/core/window-private.h |    2 ++
 src/core/window.c         |    2 +-
 src/meta/types.h          |    5 -----
 src/x11/group-private.h   |   41 -----------------------------------------
 src/x11/group-props.c     |    1 -
 src/x11/group-props.h     |    2 +-
 src/x11/group.c           |    2 +-
 src/{meta => x11}/group.h |   26 +++++++++++++++++---------
 src/x11/window-props.c    |    2 +-
 11 files changed, 25 insertions(+), 64 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index fff1f22..7bb7b58 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -183,11 +183,10 @@ libmutter_wayland_la_SOURCES =                    \
        x11/iconcache.h                         \
        x11/async-getprop.c                     \
        x11/async-getprop.h                     \
-       x11/group-private.h                     \
        x11/group-props.c                       \
        x11/group-props.h                       \
        x11/group.c                             \
-       meta/group.h                            \
+       x11/group.h                             \
        x11/window-props.c                      \
        x11/window-props.h                      \
        x11/window-x11.c                        \
@@ -234,7 +233,6 @@ libmutterinclude_base_headers =             \
        meta/display.h                          \
        meta/errors.h                           \
        meta/gradient.h                         \
-       meta/group.h                            \
        meta/keybindings.h                      \
        meta/main.h                             \
        meta/meta-background-actor.h            \
diff --git a/src/core/stack.c b/src/core/stack.c
index c9223cc..c088bea 100644
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -30,7 +30,7 @@
 #include "window-private.h"
 #include <meta/errors.h>
 #include "frame.h"
-#include <meta/group.h>
+#include "group.h"
 #include <meta/prefs.h>
 #include <meta/workspace.h>
 
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 8a90de6..b52d88b 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -45,6 +45,8 @@
 #include <clutter/clutter.h>
 #include "meta-wayland-types.h"
 
+#include "group.h"
+
 typedef struct _MetaWindowQueue MetaWindowQueue;
 
 typedef enum {
diff --git a/src/core/window.c b/src/core/window.c
index 6bc821a..2a4503d 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -43,7 +43,7 @@
 #include <meta/prefs.h>
 #include "resizepopup.h"
 #include "xprops.h"
-#include <meta/group.h>
+#include "group.h"
 #include "window-props.h"
 #include "constraints.h"
 #include "mutter-enum-types.h"
diff --git a/src/meta/types.h b/src/meta/types.h
index cd6af2b..13446ef 100644
--- a/src/meta/types.h
+++ b/src/meta/types.h
@@ -30,11 +30,6 @@ typedef struct _MetaFrame       MetaFrame;
 typedef struct _MetaScreen      MetaScreen;
 typedef struct _MetaWindow      MetaWindow;
 typedef struct _MetaWorkspace   MetaWorkspace;
-/**
- * MetaGroup: (skip)
- *
- */
-typedef struct _MetaGroup       MetaGroup;
 typedef struct _MetaKeyBinding  MetaKeyBinding;
 typedef struct _MetaCursorTracker MetaCursorTracker;
 
diff --git a/src/x11/group-props.c b/src/x11/group-props.c
index 521ffbd..f079d2c 100644
--- a/src/x11/group-props.c
+++ b/src/x11/group-props.c
@@ -21,7 +21,6 @@
 
 #include <config.h>
 #include "group-props.h"
-#include "group-private.h"
 #include "xprops.h"
 #include <X11/Xatom.h>
 
diff --git a/src/x11/group-props.h b/src/x11/group-props.h
index 1fb49ea..492b872 100644
--- a/src/x11/group-props.h
+++ b/src/x11/group-props.h
@@ -22,7 +22,7 @@
 #ifndef META_GROUP_PROPS_H
 #define META_GROUP_PROPS_H
 
-#include <meta/group.h>
+#include "group.h"
 #include "window-private.h"
 
 void meta_group_reload_property         (MetaGroup   *group,
diff --git a/src/x11/group.c b/src/x11/group.c
index 8965735..71b2280 100644
--- a/src/x11/group.c
+++ b/src/x11/group.c
@@ -27,7 +27,7 @@
 
 #include <config.h>
 #include <meta/util.h>
-#include "group-private.h"
+#include "group.h"
 #include "group-props.h"
 #include "window-private.h"
 #include <meta/window.h>
diff --git a/src/meta/group.h b/src/x11/group.h
similarity index 84%
rename from src/meta/group.h
rename to src/x11/group.h
index 2ec6478..7d97e44 100644
--- a/src/meta/group.h
+++ b/src/x11/group.h
@@ -1,10 +1,10 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
-/* Mutter window groups */
+/* Mutter window group private header */
 
-/* 
+/*
  * Copyright (C) 2002 Red Hat Inc.
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
@@ -14,7 +14,7 @@
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
@@ -26,9 +26,21 @@
 #include <glib.h>
 #include <meta/types.h>
 
+typedef struct _MetaGroup MetaGroup;
+
+struct _MetaGroup
+{
+  int refcount;
+  MetaDisplay *display;
+  GSList *windows;
+  Window group_leader;
+  char *startup_id;
+  char *wm_client_machine;
+};
+
 /* note, can return NULL */
 MetaGroup* meta_window_get_group       (MetaWindow *window);
-void       meta_window_compute_group   (MetaWindow* window);
+void       meta_window_compute_group   (MetaWindow *window);
 void       meta_window_shutdown_group  (MetaWindow *window);
 
 void       meta_window_group_leader_changed (MetaWindow *window);
@@ -49,7 +61,3 @@ gboolean meta_group_property_notify   (MetaGroup  *group,
                                        XEvent     *event);
 
 #endif
-
-
-
-
diff --git a/src/x11/window-props.c b/src/x11/window-props.c
index b1bd6e1..5b4707b 100644
--- a/src/x11/window-props.c
+++ b/src/x11/window-props.c
@@ -44,7 +44,7 @@
 #include <meta/errors.h>
 #include "xprops.h"
 #include "frame.h"
-#include <meta/group.h>
+#include "group.h"
 #include <X11/Xatom.h>
 #include <unistd.h>
 #include <string.h>