diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-03-31 23:33:01 -0400 |
|---|---|---|
| committer | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-03-31 23:44:47 -0400 |
| commit | fd392cc1e736e7c69263e34e5f65f9a8647b04e5 (patch) | |
| tree | b862a10fc8586dcfafbbdf991320adb51f0af1bf | |
| parent | b641d9d5a8abb35443afe9140a60ca40ecd49bd1 (diff) | |
| download | mutter-fd392cc1e736e7c69263e34e5f65f9a8647b04e5.tar.gz | |
Remove "xrandr" from the name of the generated DBus files
It's about generic display config, not XRandR specifically.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | src/backends/meta-monitor-manager.c | 2 | ||||
| -rw-r--r-- | src/backends/meta-monitor-manager.h | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 7a08ed3ca..efe17465b 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 b8f055728..78c0230e8 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 aaf318eb0..74b68acf6 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 2a553c9de..a1a33b5c5 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; |