libmetacity: don't expose MetaFrameStyle

8 files changed, 40 insertions, 34 deletions

diff --git a/libmetacity/Makefile.am b/libmetacity/Makefile.am
index acbf25b7..e2d0f48e 100644
--- a/libmetacity/Makefile.am
+++ b/libmetacity/Makefile.am
@@ -25,7 +25,7 @@ libmetacity_la_SOURCES = \
 	meta-frame-layout.c \
 	meta-frame-layout-private.h \
 	meta-frame-style.c \
-	meta-frame-style.h \
+	meta-frame-style-private.h \
 	meta-gradient.c \
 	meta-gradient-private.h \
 	meta-gradient-spec.c \
@@ -78,7 +78,6 @@ libmetacity_include_HEADERS = \
 	meta-enum-types.h \
 	meta-frame-borders.h \
 	meta-frame-enums.h \
-	meta-frame-style.h \
 	meta-theme.h \
 	$(NULL)
 
diff --git a/libmetacity/meta-frame-style.h b/libmetacity/meta-frame-style-private.h
index dc6426f9..2769cc03 100644
--- a/libmetacity/meta-frame-style.h
+++ b/libmetacity/meta-frame-style-private.h
@@ -16,20 +16,19 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef META_FRAME_STYLE_H
-#define META_FRAME_STYLE_H
+#ifndef META_FRAME_STYLE_PRIVATE_H
+#define META_FRAME_STYLE_PRIVATE_H
 
-#include <gtk/gtk.h>
-#include <libmetacity/meta-button-enums.h>
-#include <libmetacity/meta-frame-enums.h>
+#include "meta-button-enums.h"
+#include "meta-color-spec-private.h"
+#include "meta-draw-op-private.h"
+#include "meta-frame-enums.h"
+#include "meta-frame-layout-private.h"
 
 G_BEGIN_DECLS
 
-typedef struct _MetaColorSpec MetaColorSpec;
-typedef struct _MetaFrameLayout MetaFrameLayout;
 typedef struct _MetaFrameStyle MetaFrameStyle;
 typedef struct _MetaFrameStyleSet MetaFrameStyleSet;
-typedef struct _MetaDrawOpList MetaDrawOpList;
 
 /**
  * How to draw a frame in a particular state (say, a focussed, non-maximised,
@@ -90,33 +89,43 @@ struct _MetaFrameStyleSet
   MetaFrameStyle *tiled_right_and_shaded_styles[META_FRAME_FOCUS_LAST];
 };
 
-MetaFrameStyle    *meta_frame_style_new           (MetaFrameStyle        *parent);
+G_GNUC_INTERNAL
+MetaFrameStyle    *meta_frame_style_new           (MetaFrameStyle     *parent);
 
-void               meta_frame_style_ref           (MetaFrameStyle        *style);
+G_GNUC_INTERNAL
+void               meta_frame_style_ref           (MetaFrameStyle     *style);
 
-void               meta_frame_style_unref         (MetaFrameStyle        *style);
+G_GNUC_INTERNAL
+void               meta_frame_style_unref         (MetaFrameStyle     *style);
 
-gboolean           meta_frame_style_validate      (MetaFrameStyle        *style,
-                                                   guint                  current_theme_version,
-                                                   GError               **error);
+G_GNUC_INTERNAL
+gboolean           meta_frame_style_validate      (MetaFrameStyle     *style,
+                                                   guint               current_theme_version,
+                                                   GError            **error);
 
-MetaDrawOpList    *meta_frame_style_get_button    (MetaFrameStyle        *style,
-                                                   MetaButtonType         type,
-                                                   MetaButtonState        state);
+G_GNUC_INTERNAL
+MetaDrawOpList    *meta_frame_style_get_button    (MetaFrameStyle     *style,
+                                                   MetaButtonType      type,
+                                                   MetaButtonState     state);
 
-MetaFrameStyleSet *meta_frame_style_set_new       (MetaFrameStyleSet     *parent);
+G_GNUC_INTERNAL
+MetaFrameStyleSet *meta_frame_style_set_new       (MetaFrameStyleSet  *parent);
 
-void               meta_frame_style_set_ref       (MetaFrameStyleSet     *style_set);
+G_GNUC_INTERNAL
+void               meta_frame_style_set_ref       (MetaFrameStyleSet  *style_set);
 
-void               meta_frame_style_set_unref     (MetaFrameStyleSet     *style_set);
+G_GNUC_INTERNAL
+void               meta_frame_style_set_unref     (MetaFrameStyleSet  *style_set);
 
-gboolean           meta_frame_style_set_validate  (MetaFrameStyleSet     *style_set,
-                                                   GError               **error);
+G_GNUC_INTERNAL
+gboolean           meta_frame_style_set_validate  (MetaFrameStyleSet  *style_set,
+                                                   GError            **error);
 
-MetaFrameStyle    *meta_frame_style_set_get_style (MetaFrameStyleSet     *style_set,
-                                                   MetaFrameState         state,
-                                                   MetaFrameResize        resize,
-                                                   MetaFrameFocus         focus);
+G_GNUC_INTERNAL
+MetaFrameStyle    *meta_frame_style_set_get_style (MetaFrameStyleSet  *style_set,
+                                                   MetaFrameState      state,
+                                                   MetaFrameResize     resize,
+                                                   MetaFrameFocus      focus);
 
 G_END_DECLS
 
diff --git a/libmetacity/meta-frame-style.c b/libmetacity/meta-frame-style.c
index 6be57807..e120b6af 100644
--- a/libmetacity/meta-frame-style.c
+++ b/libmetacity/meta-frame-style.c
@@ -23,7 +23,7 @@
 #include "meta-color-spec-private.h"
 #include "meta-draw-op-private.h"
 #include "meta-frame-layout-private.h"
-#include "meta-frame-style.h"
+#include "meta-frame-style-private.h"
 #include "meta-theme.h"
 #include "meta-theme-metacity-private.h"
 
diff --git a/libmetacity/meta-theme-gtk.c b/libmetacity/meta-theme-gtk.c
index 1a0774bc..6081affc 100644
--- a/libmetacity/meta-theme-gtk.c
+++ b/libmetacity/meta-theme-gtk.c
@@ -22,7 +22,7 @@
 #include <string.h>
 
 #include "meta-frame-layout-private.h"
-#include "meta-frame-style.h"
+#include "meta-frame-style-private.h"
 #include "meta-theme-gtk-private.h"
 #include "meta-theme.h"
 
diff --git a/libmetacity/meta-theme-impl-private.h b/libmetacity/meta-theme-impl-private.h
index 0ee88f3c..78cb925a 100644
--- a/libmetacity/meta-theme-impl-private.h
+++ b/libmetacity/meta-theme-impl-private.h
@@ -21,7 +21,7 @@
 #include "meta-button-layout.h"
 #include "meta-frame-borders.h"
 #include "meta-frame-enums.h"
-#include "meta-frame-style.h"
+#include "meta-frame-style-private.h"
 #include "meta-style-info-private.h"
 
 G_BEGIN_DECLS
diff --git a/libmetacity/meta-theme-impl.c b/libmetacity/meta-theme-impl.c
index 64a8f796..aed2c48d 100644
--- a/libmetacity/meta-theme-impl.c
+++ b/libmetacity/meta-theme-impl.c
@@ -19,7 +19,6 @@
 
 #include <glib/gi18n.h>
 
-#include "meta-frame-style.h"
 #include "meta-theme-impl-private.h"
 #include "meta-theme.h"
 
diff --git a/libmetacity/meta-theme-metacity.c b/libmetacity/meta-theme-metacity.c
index f0e041b4..f91ace12 100644
--- a/libmetacity/meta-theme-metacity.c
+++ b/libmetacity/meta-theme-metacity.c
@@ -25,7 +25,7 @@
 
 #include "meta-draw-op-private.h"
 #include "meta-frame-layout-private.h"
-#include "meta-frame-style.h"
+#include "meta-frame-style-private.h"
 #include "meta-theme.h"
 #include "meta-theme-metacity-private.h"
 
diff --git a/libmetacity/meta-theme.h b/libmetacity/meta-theme.h
index a8572341..b06370db 100644
--- a/libmetacity/meta-theme.h
+++ b/libmetacity/meta-theme.h
@@ -24,7 +24,6 @@
 #include <libmetacity/meta-button-layout.h>
 #include <libmetacity/meta-frame-borders.h>
 #include <libmetacity/meta-frame-enums.h>
-#include <libmetacity/meta-frame-style.h>
 
 G_BEGIN_DECLS