From 25d628aea2ebf65f575d9677da19ec65b22cb30b Mon Sep 17 00:00:00 2001
From: Tomas Frydrych <tf@o-hand.com>
Date: Thu, 15 Jan 2009 15:37:48 +0000
Subject: [PATCH] Exposed MetaGroup API.

---
 src/Makefile.am               | 3 ++-
 src/core/group-props.h        | 1 +
 src/core/group.c              | 1 +
 src/core/window-private.h     | 1 -
 src/{core => include}/group.h | 4 +++-
 src/include/types.h           | 2 ++
 6 files changed, 9 insertions(+), 3 deletions(-)
 rename src/{core => include}/group.h (96%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 795717e09..75690dda3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,7 +47,7 @@ metacity_SOURCES= 				\
 	core/group-props.c			\
 	core/group-props.h			\
 	core/group.c				\
-	core/group.h				\
+	include/group.h				\
 	core/iconcache.c			\
 	core/iconcache.h			\
 	core/keybindings.c			\
@@ -159,6 +159,7 @@ libmetacityinclude_HEADERS =			\
 	include/types.h				\
 	include/screen.h			\
 	include/display.h			\
+	include/group.h				\
 	include/mutter-plugin.h
 
 metacity_theme_viewer_SOURCES=  \
diff --git a/src/core/group-props.h b/src/core/group-props.h
index ffde09014..a663e3a42 100644
--- a/src/core/group-props.h
+++ b/src/core/group-props.h
@@ -25,6 +25,7 @@
 #define META_GROUP_PROPS_H
 
 #include "group.h"
+#include "window-private.h"
 
 void meta_group_reload_property         (MetaGroup   *group,
                                          Atom         property);
diff --git a/src/core/group.c b/src/core/group.c
index a0c2bb6a1..0c4a820de 100644
--- a/src/core/group.c
+++ b/src/core/group.c
@@ -26,6 +26,7 @@
 #include "util.h"
 #include "group-private.h"
 #include "group-props.h"
+#include "window-private.h"
 #include "window.h"
 
 static MetaGroup*
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 7afc8c8d1..959e6b7b3 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -43,7 +43,6 @@
 #include <X11/Xutil.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-typedef struct _MetaGroup MetaGroup;
 typedef struct _MetaWindowQueue MetaWindowQueue;
 
 typedef gboolean (*MetaWindowForeachFunc) (MetaWindow *window,
diff --git a/src/core/group.h b/src/include/group.h
similarity index 96%
rename from src/core/group.h
rename to src/include/group.h
index dae1a5d60..45f03b03a 100644
--- a/src/core/group.h
+++ b/src/include/group.h
@@ -24,7 +24,9 @@
 #ifndef META_GROUP_H
 #define META_GROUP_H
 
-#include "window-private.h"
+#include <X11/Xlib.h>
+#include <glib.h>
+#include "types.h"
 
 /* note, can return NULL */
 MetaGroup* meta_window_get_group       (MetaWindow *window);
diff --git a/src/include/types.h b/src/include/types.h
index 92d658f96..05a091a7b 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -28,4 +28,6 @@ typedef struct _MetaFrame       MetaFrame;
 typedef struct _MetaScreen      MetaScreen;
 typedef struct _MetaWindow      MetaWindow;
 typedef struct _MetaWorkspace   MetaWorkspace;
+typedef struct _MetaGroup       MetaGroup;
+
 #endif