From d5552cc372405d0eb4b8e06e3382d2d23cdaf9ff Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 31 Mar 2014 23:34:23 -0400 Subject: [PATCH] Rename meta-xrandr-shared to meta-display-config-shared --- ...{meta-xrandr-shared.h => meta-display-config-shared.h} | 8 ++++---- src/backends/meta-monitor-manager.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) rename src/backends/{meta-xrandr-shared.h => meta-display-config-shared.h} (84%) diff --git a/src/backends/meta-xrandr-shared.h b/src/backends/meta-display-config-shared.h similarity index 84% rename from src/backends/meta-xrandr-shared.h rename to src/backends/meta-display-config-shared.h index 99e3d9825..92665cc00 100644 --- a/src/backends/meta-xrandr-shared.h +++ b/src/backends/meta-display-config-shared.h @@ -16,7 +16,7 @@ * along with this program; if not, see . */ -/* This file is shared between mutter (src/core/meta-xrandr-shared.h) +/* This file is shared between mutter (src/core/meta-display-config-shared.h) and gnome-desktop (libgnome-desktop/meta-xrandr-shared.h). The canonical place for all changes is mutter. @@ -24,8 +24,8 @@ There should be no includes in this file. */ -#ifndef META_XRANDR_SHARED_H -#define META_XRANDR_SHARED_H +#ifndef META_DISPLAY_CONFIG_SHARED_H +#define META_DISPLAY_CONFIG_SHARED_H typedef enum { META_POWER_SAVE_UNSUPPORTED = -1, @@ -35,4 +35,4 @@ typedef enum { META_POWER_SAVE_OFF, } MetaPowerSave; -#endif +#endif /* META_DISPLAY_CONFIG_SHARED_H */ diff --git a/src/backends/meta-monitor-manager.h b/src/backends/meta-monitor-manager.h index a1a33b5c5..0feb73d25 100644 --- a/src/backends/meta-monitor-manager.h +++ b/src/backends/meta-monitor-manager.h @@ -43,8 +43,8 @@ #include "stack-tracker.h" #include "ui.h" #include -#include "meta-xrandr-shared.h" +#include "meta-display-config-shared.h" #include "meta-dbus-display-config.h" typedef struct _MetaMonitorManagerClass MetaMonitorManagerClass;