summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-03-31 21:59:16 -0400
committerJasper St. Pierre <jstpierre@mecheye.net>2014-03-31 22:05:22 -0400
commit28b9160c016b0cb4b8cfcfe7cbc3e6956fabcd93 (patch)
treec8d8e4dc1ba0c24052a93972269eca567a4963a5 /src
parentba6584a0d7dbf0fd75865632e69111f31f666887 (diff)
downloadmutter-28b9160c016b0cb4b8cfcfe7cbc3e6956fabcd93.tar.gz
Rename monitor-config => meta-monitor-config
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am4
-rw-r--r--src/core/meta-monitor-config.c (renamed from src/core/monitor-config.c)2
-rw-r--r--src/core/meta-monitor-config.h (renamed from src/core/monitor-config.h)0
-rw-r--r--src/core/meta-monitor-manager-xrandr.c2
-rw-r--r--src/core/monitor.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index ca8fac057..d9d824229 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -143,8 +143,8 @@ libmutter_wayland_la_SOURCES = \
core/meta-xrandr-shared.h \
core/monitor.c \
core/monitor-private.h \
- core/monitor-config.c \
- core/monitor-config.h \
+ core/meta-monitor-config.c \
+ core/meta-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/monitor-config.c b/src/core/meta-monitor-config.c
index 91f3a82f2..bf57796a1 100644
--- a/src/core/monitor-config.c
+++ b/src/core/meta-monitor-config.c
@@ -34,7 +34,7 @@
#include "config.h"
-#include "monitor-config.h"
+#include "meta-monitor-config.h"
#include <string.h>
#include <clutter/clutter.h>
diff --git a/src/core/monitor-config.h b/src/core/meta-monitor-config.h
index caf4abf52..caf4abf52 100644
--- a/src/core/monitor-config.h
+++ b/src/core/meta-monitor-config.h
diff --git a/src/core/meta-monitor-manager-xrandr.c b/src/core/meta-monitor-manager-xrandr.c
index 5aba4877d..86ce344ee 100644
--- a/src/core/meta-monitor-manager-xrandr.c
+++ b/src/core/meta-monitor-manager-xrandr.c
@@ -39,7 +39,7 @@
#include <meta/main.h>
#include <meta/errors.h>
#include "edid.h"
-#include "monitor-config.h"
+#include "meta-monitor-config.h"
#define ALL_WL_TRANSFORMS ((1 << (WL_OUTPUT_TRANSFORM_FLIPPED_270 + 1)) - 1)
diff --git a/src/core/monitor.c b/src/core/monitor.c
index c7e88a163..95f83c81d 100644
--- a/src/core/monitor.c
+++ b/src/core/monitor.c
@@ -34,7 +34,7 @@
#include "util-private.h"
#include <meta/errors.h>
#include "monitor-private.h"
-#include "monitor-config.h"
+#include "meta-monitor-config.h"
#include "meta-monitor-manager-kms.h"
#include "meta-monitor-manager-xrandr.h"
#include "meta-monitor-manager-dummy.h"