[metacity] libmetacity: merge meta-frame-flags.h and meta-frame-type.h

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

commit ff3b1e4de7ca5d3593ac8e81bc4571dfd93c4710
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Jan 31 03:12:29 2016 +0200

    libmetacity: merge meta-frame-flags.h and meta-frame-type.h

 libmetacity/Makefile.am        |    6 +--
 libmetacity/meta-frame-enums.h |   61 ++++++++++++++++++++++++++++++++++++++++
 libmetacity/meta-frame-type.h  |   39 -------------------------
 src/include/ui.h               |    3 +-
 src/ui/theme.h                 |    3 +-
 5 files changed, 65 insertions(+), 47 deletions(-)
---
diff --git a/libmetacity/Makefile.am b/libmetacity/Makefile.am
index 4c1278c..d44fb00 100644
--- a/libmetacity/Makefile.am
+++ b/libmetacity/Makefile.am
@@ -18,10 +18,9 @@ libmetacity_la_SOURCES = \
        meta-draw-spec.h \
        meta-frame-borders.c \
        meta-frame-borders.h \
-       meta-frame-flags.h \
+       meta-frame-enums.h \
        meta-frame-layout.c \
        meta-frame-layout.h \
-       meta-frame-type.h \
        meta-gradient.c \
        meta-gradient.h \
        meta-gradient-private.h \
@@ -70,9 +69,8 @@ libmetacity_include_HEADERS = \
        meta-draw-op.h \
        meta-draw-spec.h \
        meta-frame-borders.h \
-       meta-frame-flags.h \
+       meta-frame-enums.h \
        meta-frame-layout.h \
-       meta-frame-type.h \
        meta-gradient.h \
        meta-gradient-spec.h \
        meta-style-info.h \
diff --git a/libmetacity/meta-frame-enums.h b/libmetacity/meta-frame-enums.h
new file mode 100644
index 0000000..2e6c6a7
--- /dev/null
+++ b/libmetacity/meta-frame-enums.h
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2001 Havoc Pennington
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef META_FRAME_ENUMS_H
+#define META_FRAME_ENUMS_H
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+typedef enum
+{
+  META_FRAME_ALLOWS_DELETE            = 1 << 0,
+  META_FRAME_ALLOWS_MENU              = 1 << 1,
+  META_FRAME_ALLOWS_APPMENU           = 1 << 2,
+  META_FRAME_ALLOWS_MINIMIZE          = 1 << 3,
+  META_FRAME_ALLOWS_MAXIMIZE          = 1 << 4,
+  META_FRAME_ALLOWS_VERTICAL_RESIZE   = 1 << 5,
+  META_FRAME_ALLOWS_HORIZONTAL_RESIZE = 1 << 6,
+  META_FRAME_HAS_FOCUS                = 1 << 7,
+  META_FRAME_SHADED                   = 1 << 8,
+  META_FRAME_STUCK                    = 1 << 9,
+  META_FRAME_MAXIMIZED                = 1 << 10,
+  META_FRAME_ALLOWS_SHADE             = 1 << 11,
+  META_FRAME_ALLOWS_MOVE              = 1 << 12,
+  META_FRAME_FULLSCREEN               = 1 << 13,
+  META_FRAME_IS_FLASHING              = 1 << 14,
+  META_FRAME_ABOVE                    = 1 << 15,
+  META_FRAME_TILED_LEFT               = 1 << 16,
+  META_FRAME_TILED_RIGHT              = 1 << 17
+} MetaFrameFlags;
+
+typedef enum
+{
+  META_FRAME_TYPE_NORMAL,
+  META_FRAME_TYPE_DIALOG,
+  META_FRAME_TYPE_MODAL_DIALOG,
+  META_FRAME_TYPE_UTILITY,
+  META_FRAME_TYPE_MENU,
+  META_FRAME_TYPE_BORDER,
+  META_FRAME_TYPE_ATTACHED,
+  META_FRAME_TYPE_LAST
+} MetaFrameType;
+
+G_END_DECLS
+
+#endif
diff --git a/src/include/ui.h b/src/include/ui.h
index abb679f..e1f5389 100644
--- a/src/include/ui.h
+++ b/src/include/ui.h
@@ -30,8 +30,7 @@
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libmetacity/meta-frame-borders.h>
-#include <libmetacity/meta-frame-flags.h>
-#include <libmetacity/meta-frame-type.h>
+#include <libmetacity/meta-frame-enums.h>
 
 /* This is between GTK_PRIORITY_RESIZE (+10) and GDK_PRIORITY_REDRAW (+20) */
 #define META_PRIORITY_RESIZE    (G_PRIORITY_HIGH_IDLE + 15)
diff --git a/src/ui/theme.h b/src/ui/theme.h
index 2587c9f..96b596b 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -25,8 +25,7 @@
 #include <gtk/gtk.h>
 #include <libmetacity/meta-button-layout.h>
 #include <libmetacity/meta-frame-borders.h>
-#include <libmetacity/meta-frame-flags.h>
-#include <libmetacity/meta-frame-type.h>
+#include <libmetacity/meta-frame-enums.h>
 #include <libmetacity/meta-theme.h>
 #include <libmetacity/meta-style-info.h>