libmetacity: don't expose MetaDrawOp and MetaDrawOpList

7 files changed, 22 insertions, 11 deletions

diff --git a/libmetacity/Makefile.am b/libmetacity/Makefile.am
index 9f353311..de818eea 100644
--- a/libmetacity/Makefile.am
+++ b/libmetacity/Makefile.am
@@ -14,7 +14,7 @@ libmetacity_la_SOURCES = \
 	meta-color-spec.c \
 	meta-color-spec.h \
 	meta-draw-op.c \
-	meta-draw-op.h \
+	meta-draw-op-private.h \
 	meta-draw-spec.c \
 	meta-draw-spec.h \
 	meta-frame-borders.c \
@@ -72,7 +72,6 @@ libmetacity_include_HEADERS = \
 	meta-button-layout.h \
 	meta-color.h \
 	meta-color-spec.h \
-	meta-draw-op.h \
 	meta-draw-spec.h \
 	meta-enum-types.h \
 	meta-frame-borders.h \
diff --git a/libmetacity/meta-draw-op.h b/libmetacity/meta-draw-op-private.h
index 3042957a..2cc4f1ab 100644
--- a/libmetacity/meta-draw-op.h
+++ b/libmetacity/meta-draw-op-private.h
@@ -16,14 +16,15 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef META_DRAW_OP_H
-#define META_DRAW_OP_H
+#ifndef META_DRAW_OP_PRIVATE_H
+#define META_DRAW_OP_PRIVATE_H
 
 #include <gtk/gtk.h>
-#include <libmetacity/meta-color-spec.h>
-#include <libmetacity/meta-draw-spec.h>
-#include <libmetacity/meta-frame-borders.h>
-#include <libmetacity/meta-gradient-spec.h>
+
+#include "meta-color-spec.h"
+#include "meta-draw-spec.h"
+#include "meta-frame-borders.h"
+#include "meta-gradient-spec.h"
 
 G_BEGIN_DECLS
 
@@ -236,28 +237,37 @@ struct _MetaDrawOp
   } data;
 };
 
+G_GNUC_INTERNAL
 MetaDrawOp     *meta_draw_op_new                  (MetaDrawType           type);
 
+G_GNUC_INTERNAL
 void            meta_draw_op_free                 (MetaDrawOp            *op);
 
+G_GNUC_INTERNAL
 MetaDrawOpList *meta_draw_op_list_new             (int                    n_preallocs);
 
+G_GNUC_INTERNAL
 void            meta_draw_op_list_ref             (MetaDrawOpList        *op_list);
 
+G_GNUC_INTERNAL
 void            meta_draw_op_list_unref           (MetaDrawOpList        *op_list);
 
+G_GNUC_INTERNAL
 void            meta_draw_op_list_draw_with_style (const MetaDrawOpList  *op_list,
                                                    GtkStyleContext       *context,
                                                    cairo_t               *cr,
                                                    const MetaDrawInfo    *info,
                                                    GdkRectangle           rect);
 
+G_GNUC_INTERNAL
 void            meta_draw_op_list_append          (MetaDrawOpList        *op_list,
                                                    MetaDrawOp            *op);
 
+G_GNUC_INTERNAL
 gboolean        meta_draw_op_list_validate        (MetaDrawOpList        *op_list,
                                                    GError               **error);
 
+G_GNUC_INTERNAL
 gboolean        meta_draw_op_list_contains        (MetaDrawOpList        *op_list,
                                                    MetaDrawOpList        *child);
 
diff --git a/libmetacity/meta-draw-op.c b/libmetacity/meta-draw-op.c
index e57e595d..23c3c9de 100644
--- a/libmetacity/meta-draw-op.c
+++ b/libmetacity/meta-draw-op.c
@@ -21,7 +21,7 @@
 #include <glib/gi18n-lib.h>
 #include <math.h>
 
-#include "meta-draw-op.h"
+#include "meta-draw-op-private.h"
 
 #define GDK_COLOR_RGBA(color)                            \
         ((guint32) (0xff                               | \
diff --git a/libmetacity/meta-frame-style.c b/libmetacity/meta-frame-style.c
index 0df2d4f1..7543bac5 100644
--- a/libmetacity/meta-frame-style.c
+++ b/libmetacity/meta-frame-style.c
@@ -20,6 +20,7 @@
 
 #include <glib/gi18n-lib.h>
 
+#include "meta-draw-op-private.h"
 #include "meta-frame-style.h"
 #include "meta-theme.h"
 #include "meta-theme-metacity-private.h"
diff --git a/libmetacity/meta-frame-style.h b/libmetacity/meta-frame-style.h
index 43db4151..84cacc43 100644
--- a/libmetacity/meta-frame-style.h
+++ b/libmetacity/meta-frame-style.h
@@ -21,7 +21,6 @@
 
 #include <libmetacity/meta-button-enums.h>
 #include <libmetacity/meta-color-spec.h>
-#include <libmetacity/meta-draw-op.h>
 #include <libmetacity/meta-frame-enums.h>
 #include <libmetacity/meta-frame-layout.h>
 
@@ -29,6 +28,7 @@ G_BEGIN_DECLS
 
 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,
diff --git a/libmetacity/meta-theme-impl-private.h b/libmetacity/meta-theme-impl-private.h
index f36f45f5..cd3200e3 100644
--- a/libmetacity/meta-theme-impl-private.h
+++ b/libmetacity/meta-theme-impl-private.h
@@ -19,6 +19,7 @@
 #define META_THEME_IMPL_PRIVATE_H
 
 #include "meta-button-layout.h"
+#include "meta-frame-borders.h"
 #include "meta-frame-enums.h"
 #include "meta-frame-style.h"
 #include "meta-style-info-private.h"
diff --git a/libmetacity/meta-theme-metacity.c b/libmetacity/meta-theme-metacity.c
index 0942693b..c8fa0a27 100644
--- a/libmetacity/meta-theme-metacity.c
+++ b/libmetacity/meta-theme-metacity.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "meta-draw-op.h"
+#include "meta-draw-op-private.h"
 #include "meta-frame-layout.h"
 #include "meta-frame-style.h"
 #include "meta-theme.h"