[mutter/wayland] Move monitor-config to its own header file

[Jasper St. Pierre <jstpierre src gnome org>]

commit ba6584a0d7dbf0fd75865632e69111f31f666887
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Mar 31 21:57:58 2014 -0400

    Move monitor-config to its own header file

 src/Makefile.am                        |    3 +-
 src/core/meta-monitor-manager-xrandr.c |    1 +
 src/core/monitor-config.c              |    2 +
 src/core/monitor-config.h              |   55 ++++++++++++++++++++++++++++++++
 src/core/monitor-private.h             |   27 ---------------
 src/core/monitor.c                     |    1 +
 6 files changed, 61 insertions(+), 28 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c53a6c9..ca8fac0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -142,8 +142,9 @@ libmutter_wayland_la_SOURCES =                      \
        core/meta-idle-monitor-native.h         \
        core/meta-xrandr-shared.h               \
        core/monitor.c                          \
-       core/monitor-config.c                   \
        core/monitor-private.h                  \
+       core/monitor-config.c                   \
+       core/monitor-config.h                   \
        core/meta-monitor-manager-dummy.c       \
        core/meta-monitor-manager-dummy.h       \
        core/meta-monitor-manager-kms.c         \
diff --git a/src/core/meta-monitor-manager-xrandr.c b/src/core/meta-monitor-manager-xrandr.c
index 59b5fba..5aba487 100644
--- a/src/core/meta-monitor-manager-xrandr.c
+++ b/src/core/meta-monitor-manager-xrandr.c
@@ -39,6 +39,7 @@
 #include <meta/main.h>
 #include <meta/errors.h>
 #include "edid.h"
+#include "monitor-config.h"
 
 #define ALL_WL_TRANSFORMS ((1 << (WL_OUTPUT_TRANSFORM_FLIPPED_270 + 1)) - 1)
 
diff --git a/src/core/monitor-config.c b/src/core/monitor-config.c
index 5d69a5d..91f3a82 100644
--- a/src/core/monitor-config.c
+++ b/src/core/monitor-config.c
@@ -34,6 +34,8 @@
 
 #include "config.h"
 
+#include "monitor-config.h"
+
 #include <string.h>
 #include <clutter/clutter.h>
 #include <libupower-glib/upower.h>
diff --git a/src/core/monitor-config.h b/src/core/monitor-config.h
new file mode 100644
index 0000000..caf4abf
--- /dev/null
+++ b/src/core/monitor-config.h
@@ -0,0 +1,55 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2001 Havoc Pennington
+ * Copyright (C) 2003 Rob Adams
+ * Copyright (C) 2004-2006 Elijah Newren
+ * Copyright (C) 2013 Red Hat Inc.
+ *
+ * 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_MONITOR_CONFIG_H
+#define META_MONITOR_CONFIG_H
+
+#include "monitor-private.h"
+
+#define META_TYPE_MONITOR_CONFIG            (meta_monitor_config_get_type ())
+#define META_MONITOR_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_CONFIG, 
MetaMonitorConfig))
+#define META_MONITOR_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MONITOR_CONFIG, 
MetaMonitorConfigClass))
+#define META_IS_MONITOR_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_MONITOR_CONFIG))
+#define META_IS_MONITOR_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_MONITOR_CONFIG))
+#define META_MONITOR_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_MONITOR_CONFIG, 
MetaMonitorConfigClass))
+
+GType meta_monitor_config_get_type (void) G_GNUC_CONST;
+
+MetaMonitorConfig *meta_monitor_config_new (void);
+
+gboolean           meta_monitor_config_match_current (MetaMonitorConfig  *config,
+                                                      MetaMonitorManager *manager);
+
+gboolean           meta_monitor_config_apply_stored (MetaMonitorConfig  *config,
+                                                     MetaMonitorManager *manager);
+
+void               meta_monitor_config_make_default (MetaMonitorConfig  *config,
+                                                     MetaMonitorManager *manager);
+
+void               meta_monitor_config_update_current (MetaMonitorConfig  *config,
+                                                       MetaMonitorManager *manager);
+void               meta_monitor_config_make_persistent (MetaMonitorConfig *config);
+
+void               meta_monitor_config_restore_previous (MetaMonitorConfig  *config,
+                                                         MetaMonitorManager *manager);
+
+#endif /* META_MONITOR_CONFIG_H */
diff --git a/src/core/monitor-private.h b/src/core/monitor-private.h
index 7f215b5..8fc0c57 100644
--- a/src/core/monitor-private.h
+++ b/src/core/monitor-private.h
@@ -335,33 +335,6 @@ void                meta_monitor_manager_apply_configuration (MetaMonitorManager
 void                meta_monitor_manager_confirm_configuration (MetaMonitorManager *manager,
                                                                 gboolean            ok);
 
-#define META_TYPE_MONITOR_CONFIG            (meta_monitor_config_get_type ())
-#define META_MONITOR_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_CONFIG, 
MetaMonitorConfig))
-#define META_MONITOR_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MONITOR_CONFIG, 
MetaMonitorConfigClass))
-#define META_IS_MONITOR_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_MONITOR_CONFIG))
-#define META_IS_MONITOR_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_MONITOR_CONFIG))
-#define META_MONITOR_CONFIG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_MONITOR_CONFIG, 
MetaMonitorConfigClass))
-
-GType meta_monitor_config_get_type (void) G_GNUC_CONST;
-
-MetaMonitorConfig *meta_monitor_config_new (void);
-
-gboolean           meta_monitor_config_match_current (MetaMonitorConfig  *config,
-                                                      MetaMonitorManager *manager);
-
-gboolean           meta_monitor_config_apply_stored (MetaMonitorConfig  *config,
-                                                     MetaMonitorManager *manager);
-
-void               meta_monitor_config_make_default (MetaMonitorConfig  *config,
-                                                     MetaMonitorManager *manager);
-
-void               meta_monitor_config_update_current (MetaMonitorConfig  *config,
-                                                       MetaMonitorManager *manager);
-void               meta_monitor_config_make_persistent (MetaMonitorConfig *config);
-
-void               meta_monitor_config_restore_previous (MetaMonitorConfig  *config,
-                                                         MetaMonitorManager *manager);
-
 void               meta_crtc_info_free   (MetaCRTCInfo   *info);
 void               meta_output_info_free (MetaOutputInfo *info);
 
diff --git a/src/core/monitor.c b/src/core/monitor.c
index d2d9f20..c7e88a1 100644
--- a/src/core/monitor.c
+++ b/src/core/monitor.c
@@ -34,6 +34,7 @@
 #include "util-private.h"
 #include <meta/errors.h>
 #include "monitor-private.h"
+#include "monitor-config.h"
 #include "meta-monitor-manager-kms.h"
 #include "meta-monitor-manager-xrandr.h"
 #include "meta-monitor-manager-dummy.h"