[mutter/wayland] Remove "xrandr" from the name of the generated DBus files

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

commit fd392cc1e736e7c69263e34e5f65f9a8647b04e5
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Mar 31 23:33:01 2014 -0400

    Remove "xrandr" from the name of the generated DBus files
    
    It's about generic display config, not XRandR specifically.

 .gitignore                          |    2 +-
 src/Makefile.am                     |    8 ++++----
 src/backends/meta-monitor-manager.c |    2 --
 src/backends/meta-monitor-manager.h |    2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7a08ed3..efe1746 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,7 +75,7 @@ src/mutter-enum-types.[ch]
 src/stamp-mutter-enum-types.h
 src/mutter-marshal.[ch]
 src/stamp-mutter-marshal.h
-src/meta-dbus-xrandr.[ch]
+src/meta-dbus-display-config.[ch]
 src/meta-dbus-idle-monitor.[ch]
 src/mutter-plugins.pc
 src/gtk-shell-protocol.c
diff --git a/src/Makefile.am b/src/Makefile.am
index b8f0557..78c0230 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,7 +35,7 @@ INCLUDES=                                                             \
 
 mutter_built_sources = \
        $(dbus_idle_built_sources)              \
-       $(dbus_xrandr_built_sources)            \
+       $(dbus_display_config_built_sources)    \
        mutter-enum-types.h                     \
        mutter-enum-types.c                     \
        gtk-shell-protocol.c                    \
@@ -416,13 +416,13 @@ mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
        cp xgen-tetc mutter-enum-types.c && \
        rm -f xgen-tetc
 
-dbus_xrandr_built_sources = meta-dbus-xrandr.c meta-dbus-xrandr.h
+dbus_display_config_built_sources = meta-dbus-display-config.c meta-dbus-display-config.h
 
-$(dbus_xrandr_built_sources) : Makefile.am org.gnome.Mutter.DisplayConfig.xml
+$(dbus_display_config_built_sources) : Makefile.am org.gnome.Mutter.DisplayConfig.xml
        $(AM_V_GEN)gdbus-codegen                                                        \
                --interface-prefix org.gnome.Mutter                                     \
                --c-namespace MetaDBus                                                  \
-               --generate-c-code meta-dbus-xrandr                                      \
+               --generate-c-code meta-dbus-display-config                              \
                $(srcdir)/org.gnome.Mutter.DisplayConfig.xml
 
 $(dbus_idle_built_sources) : Makefile.am org.gnome.Mutter.IdleMonitor.xml
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
index aaf318e..74b68ac 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -40,8 +40,6 @@
 #include "meta-monitor-manager-xrandr.h"
 #include "meta-monitor-manager-dummy.h"
 
-#include "meta-dbus-xrandr.h"
-
 enum {
   CONFIRM_DISPLAY_CHANGE,
   SIGNALS_LAST
diff --git a/src/backends/meta-monitor-manager.h b/src/backends/meta-monitor-manager.h
index 2a553c9..a1a33b5 100644
--- a/src/backends/meta-monitor-manager.h
+++ b/src/backends/meta-monitor-manager.h
@@ -45,7 +45,7 @@
 #include <wayland-server.h>
 #include "meta-xrandr-shared.h"
 
-#include "meta-dbus-xrandr.h"
+#include "meta-dbus-display-config.h"
 
 typedef struct _MetaMonitorManagerClass    MetaMonitorManagerClass;
 typedef struct _MetaMonitorManager         MetaMonitorManager;