[metacity] libmetacity: don't expose MetaFrameLayout
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] libmetacity: don't expose MetaFrameLayout
- Date: Sun, 7 Feb 2016 21:47:27 +0000 (UTC)
commit 76fc58683c2dc35e0ff8fef2e97662d7cd352264
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sun Feb 7 23:38:39 2016 +0200
libmetacity: don't expose MetaFrameLayout
libmetacity/Makefile.am | 3 +--
...-frame-layout.h => meta-frame-layout-private.h} | 9 +++++++--
libmetacity/meta-frame-layout.c | 2 +-
libmetacity/meta-frame-style.c | 1 +
libmetacity/meta-frame-style.h | 3 ++-
libmetacity/meta-theme-gtk.c | 1 +
libmetacity/meta-theme-metacity.c | 2 +-
libmetacity/meta-theme.c | 1 +
8 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/libmetacity/Makefile.am b/libmetacity/Makefile.am
index 03c3156..e063d73 100644
--- a/libmetacity/Makefile.am
+++ b/libmetacity/Makefile.am
@@ -21,7 +21,7 @@ libmetacity_la_SOURCES = \
meta-frame-borders.h \
meta-frame-enums.h \
meta-frame-layout.c \
- meta-frame-layout.h \
+ meta-frame-layout-private.h \
meta-frame-style.c \
meta-frame-style.h \
meta-gradient.c \
@@ -73,7 +73,6 @@ libmetacity_include_HEADERS = \
meta-enum-types.h \
meta-frame-borders.h \
meta-frame-enums.h \
- meta-frame-layout.h \
meta-frame-style.h \
meta-theme.h \
$(NULL)
diff --git a/libmetacity/meta-frame-layout.h b/libmetacity/meta-frame-layout-private.h
similarity index 96%
rename from libmetacity/meta-frame-layout.h
rename to libmetacity/meta-frame-layout-private.h
index edcf270..584ee4b 100644
--- a/libmetacity/meta-frame-layout.h
+++ b/libmetacity/meta-frame-layout-private.h
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef META_FRAME_LAYOUT_H
-#define META_FRAME_LAYOUT_H
+#ifndef META_FRAME_LAYOUT_PRIVATE_H
+#define META_FRAME_LAYOUT_PRIVATE_H
#include <gtk/gtk.h>
@@ -150,14 +150,19 @@ struct _MetaFrameLayout
guint bottom_right_corner_rounded_radius;
};
+G_GNUC_INTERNAL
MetaFrameLayout *meta_frame_layout_new (void);
+G_GNUC_INTERNAL
MetaFrameLayout *meta_frame_layout_copy (const MetaFrameLayout *src);
+G_GNUC_INTERNAL
void meta_frame_layout_ref (MetaFrameLayout *layout);
+G_GNUC_INTERNAL
void meta_frame_layout_unref (MetaFrameLayout *layout);
+G_GNUC_INTERNAL
gboolean meta_frame_layout_validate (const MetaFrameLayout *layout,
GError **error);
diff --git a/libmetacity/meta-frame-layout.c b/libmetacity/meta-frame-layout.c
index 5cf6ae0..9634a9e 100644
--- a/libmetacity/meta-frame-layout.c
+++ b/libmetacity/meta-frame-layout.c
@@ -20,7 +20,7 @@
#include <glib/gi18n-lib.h>
-#include "meta-frame-layout.h"
+#include "meta-frame-layout-private.h"
#include "meta-theme.h"
/**
diff --git a/libmetacity/meta-frame-style.c b/libmetacity/meta-frame-style.c
index 449312e..15bd4f5 100644
--- a/libmetacity/meta-frame-style.c
+++ b/libmetacity/meta-frame-style.c
@@ -22,6 +22,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-theme.h"
#include "meta-theme-metacity-private.h"
diff --git a/libmetacity/meta-frame-style.h b/libmetacity/meta-frame-style.h
index c7428c6..511c25a 100644
--- a/libmetacity/meta-frame-style.h
+++ b/libmetacity/meta-frame-style.h
@@ -19,13 +19,14 @@
#ifndef META_FRAME_STYLE_H
#define META_FRAME_STYLE_H
+#include <gtk/gtk.h>
#include <libmetacity/meta-button-enums.h>
#include <libmetacity/meta-frame-enums.h>
-#include <libmetacity/meta-frame-layout.h>
G_BEGIN_DECLS
typedef struct _MetaColorSpec MetaColorSpec;
+typedef struct _MetaFrameLayout MetaFrameLayout;
typedef struct _MetaFrameStyle MetaFrameStyle;
typedef struct _MetaFrameStyleSet MetaFrameStyleSet;
typedef struct _MetaDrawOpList MetaDrawOpList;
diff --git a/libmetacity/meta-theme-gtk.c b/libmetacity/meta-theme-gtk.c
index 8546335..8269f1c 100644
--- a/libmetacity/meta-theme-gtk.c
+++ b/libmetacity/meta-theme-gtk.c
@@ -21,6 +21,7 @@
#include <stdlib.h>
#include <string.h>
+#include "meta-frame-layout-private.h"
#include "meta-frame-style.h"
#include "meta-theme-gtk-private.h"
#include "meta-theme.h"
diff --git a/libmetacity/meta-theme-metacity.c b/libmetacity/meta-theme-metacity.c
index c8fa0a2..fbeaa6d 100644
--- a/libmetacity/meta-theme-metacity.c
+++ b/libmetacity/meta-theme-metacity.c
@@ -24,7 +24,7 @@
#include <string.h>
#include "meta-draw-op-private.h"
-#include "meta-frame-layout.h"
+#include "meta-frame-layout-private.h"
#include "meta-frame-style.h"
#include "meta-theme.h"
#include "meta-theme-metacity-private.h"
diff --git a/libmetacity/meta-theme.c b/libmetacity/meta-theme.c
index f3d2471..48a83c9 100644
--- a/libmetacity/meta-theme.c
+++ b/libmetacity/meta-theme.c
@@ -21,6 +21,7 @@
#include <string.h>
#include "meta-enum-types.h"
+#include "meta-frame-layout-private.h"
#include "meta-theme.h"
#include "meta-theme-gtk-private.h"
#include "meta-theme-impl-private.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]