[metacity] libmetacity: don't expose MetaColorSpec

[Alberts Muktupāvels <muktupavels src gnome org>]

commit cb569a970d8858a97549cc26e425a44c50e6ae7f
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Feb 7 23:18:10 2016 +0200

    libmetacity: don't expose MetaColorSpec

 libmetacity/Makefile.am                            |    3 +--
 ...meta-color-spec.h => meta-color-spec-private.h} |   10 ++++++++--
 libmetacity/meta-color-spec.c                      |    2 +-
 libmetacity/meta-draw-op-private.h                 |    2 +-
 libmetacity/meta-frame-style.c                     |    1 +
 libmetacity/meta-frame-style.h                     |    2 +-
 libmetacity/meta-gradient-spec.c                   |    2 +-
 7 files changed, 14 insertions(+), 8 deletions(-)
---
diff --git a/libmetacity/Makefile.am b/libmetacity/Makefile.am
index 8975d23..f445204 100644
--- a/libmetacity/Makefile.am
+++ b/libmetacity/Makefile.am
@@ -12,7 +12,7 @@ libmetacity_la_SOURCES = \
        meta-color.h \
        meta-color-private.h \
        meta-color-spec.c \
-       meta-color-spec.h \
+       meta-color-spec-private.h \
        meta-draw-op.c \
        meta-draw-op-private.h \
        meta-draw-spec.c \
@@ -70,7 +70,6 @@ libmetacity_include_HEADERS = \
        meta-button-function.h \
        meta-button-layout.h \
        meta-color.h \
-       meta-color-spec.h \
        meta-draw-spec.h \
        meta-enum-types.h \
        meta-frame-borders.h \
diff --git a/libmetacity/meta-color-spec.h b/libmetacity/meta-color-spec-private.h
similarity index 91%
rename from libmetacity/meta-color-spec.h
rename to libmetacity/meta-color-spec-private.h
index f58a1be..ae9e2af 100644
--- a/libmetacity/meta-color-spec.h
+++ b/libmetacity/meta-color-spec-private.h
@@ -16,8 +16,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef META_COLOR_SPEC_H
-#define META_COLOR_SPEC_H
+#ifndef META_COLOR_SPEC_PRIVATE_H
+#define META_COLOR_SPEC_PRIVATE_H
 
 #include <gtk/gtk.h>
 
@@ -27,20 +27,26 @@ typedef enum _MetaColorSpecType MetaColorSpecType;
 typedef enum _MetaGtkColorComponent MetaGtkColorComponent;
 typedef struct _MetaColorSpec MetaColorSpec;
 
+G_GNUC_INTERNAL
 MetaColorSpec *meta_color_spec_new             (MetaColorSpecType       type);
 
+G_GNUC_INTERNAL
 MetaColorSpec *meta_color_spec_new_from_string (const gchar            *str,
                                                 GError                **error);
 
+G_GNUC_INTERNAL
 MetaColorSpec *meta_color_spec_new_gtk         (MetaGtkColorComponent   component,
                                                 GtkStateFlags           state);
 
+G_GNUC_INTERNAL
 void           meta_color_spec_free            (MetaColorSpec          *spec);
 
+G_GNUC_INTERNAL
 void           meta_color_spec_render          (MetaColorSpec          *spec,
                                                 GtkStyleContext        *context,
                                                 GdkRGBA                *color);
 
+G_GNUC_INTERNAL
 gboolean       meta_gtk_state_from_string      (const gchar            *str,
                                                 GtkStateFlags          *state);
 
diff --git a/libmetacity/meta-color-spec.c b/libmetacity/meta-color-spec.c
index 8801e81..173e516 100644
--- a/libmetacity/meta-color-spec.c
+++ b/libmetacity/meta-color-spec.c
@@ -22,7 +22,7 @@
 
 #include "meta-color.h"
 #include "meta-color-private.h"
-#include "meta-color-spec.h"
+#include "meta-color-spec-private.h"
 #include "meta-theme.h"
 
 enum _MetaColorSpecType
diff --git a/libmetacity/meta-draw-op-private.h b/libmetacity/meta-draw-op-private.h
index ad3260d..c56ea36 100644
--- a/libmetacity/meta-draw-op-private.h
+++ b/libmetacity/meta-draw-op-private.h
@@ -21,7 +21,7 @@
 
 #include <gtk/gtk.h>
 
-#include "meta-color-spec.h"
+#include "meta-color-spec-private.h"
 #include "meta-draw-spec.h"
 #include "meta-frame-borders.h"
 #include "meta-gradient-spec-private.h"
diff --git a/libmetacity/meta-frame-style.c b/libmetacity/meta-frame-style.c
index 7543bac..449312e 100644
--- a/libmetacity/meta-frame-style.c
+++ b/libmetacity/meta-frame-style.c
@@ -20,6 +20,7 @@
 
 #include <glib/gi18n-lib.h>
 
+#include "meta-color-spec-private.h"
 #include "meta-draw-op-private.h"
 #include "meta-frame-style.h"
 #include "meta-theme.h"
diff --git a/libmetacity/meta-frame-style.h b/libmetacity/meta-frame-style.h
index 84cacc4..c7428c6 100644
--- a/libmetacity/meta-frame-style.h
+++ b/libmetacity/meta-frame-style.h
@@ -20,12 +20,12 @@
 #define META_FRAME_STYLE_H
 
 #include <libmetacity/meta-button-enums.h>
-#include <libmetacity/meta-color-spec.h>
 #include <libmetacity/meta-frame-enums.h>
 #include <libmetacity/meta-frame-layout.h>
 
 G_BEGIN_DECLS
 
+typedef struct _MetaColorSpec MetaColorSpec;
 typedef struct _MetaFrameStyle MetaFrameStyle;
 typedef struct _MetaFrameStyleSet MetaFrameStyleSet;
 typedef struct _MetaDrawOpList MetaDrawOpList;
diff --git a/libmetacity/meta-gradient-spec.c b/libmetacity/meta-gradient-spec.c
index 76c6ccd..71f4f5b 100644
--- a/libmetacity/meta-gradient-spec.c
+++ b/libmetacity/meta-gradient-spec.c
@@ -20,7 +20,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "meta-color-spec.h"
+#include "meta-color-spec-private.h"
 #include "meta-gradient-private.h"
 #include "meta-gradient-spec-private.h"
 #include "meta-theme.h"