isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 09:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove "xrandr" from the name of the generated DBus files

Browse Source 
It's about generic display config, not XRandR specifically.
This commit is contained in:
Jasper St. Pierre 2014-03-31 23:33:01 -04:00
parent b641d9d5a8
commit fd392cc1e7
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -75,7 +75,7 @@ src/mutter-enum-types.[ch]
src/stamp-mutter-enum-types.h src/stamp-mutter-enum-types.h
src/mutter-marshal.[ch] src/mutter-marshal.[ch]
src/stamp-mutter-marshal.h src/stamp-mutter-marshal.h
src/meta-dbus-xrandr.[ch] src/meta-dbus-display-config.[ch]
src/meta-dbus-idle-monitor.[ch] src/meta-dbus-idle-monitor.[ch]
src/mutter-plugins.pc src/mutter-plugins.pc
src/gtk-shell-protocol.c src/gtk-shell-protocol.c

8
src/Makefile.am
View File

@ -35,7 +35,7 @@ INCLUDES= \
mutter_built_sources = \ mutter_built_sources = \
$(dbus_idle_built_sources) \ $(dbus_idle_built_sources) \
$(dbus_xrandr_built_sources) \ $(dbus_display_config_built_sources) \
mutter-enum-types.h \ mutter-enum-types.h \
mutter-enum-types.c \ mutter-enum-types.c \
gtk-shell-protocol.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 && \ cp xgen-tetc mutter-enum-types.c && \
rm -f xgen-tetc 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 \ $(AM_V_GEN)gdbus-codegen \
--interface-prefix org.gnome.Mutter \ --interface-prefix org.gnome.Mutter \
--c-namespace MetaDBus \ --c-namespace MetaDBus \
--generate-c-code meta-dbus-xrandr \ --generate-c-code meta-dbus-display-config \
$(srcdir)/org.gnome.Mutter.DisplayConfig.xml $(srcdir)/org.gnome.Mutter.DisplayConfig.xml
$(dbus_idle_built_sources) : Makefile.am org.gnome.Mutter.IdleMonitor.xml $(dbus_idle_built_sources) : Makefile.am org.gnome.Mutter.IdleMonitor.xml

2
src/backends/meta-monitor-manager.c
View File

@ -40,8 +40,6 @@
#include "meta-monitor-manager-xrandr.h" #include "meta-monitor-manager-xrandr.h"
#include "meta-monitor-manager-dummy.h" #include "meta-monitor-manager-dummy.h"
#include "meta-dbus-xrandr.h"
enum { enum {
CONFIRM_DISPLAY_CHANGE, CONFIRM_DISPLAY_CHANGE,
SIGNALS_LAST SIGNALS_LAST

2
src/backends/meta-monitor-manager.h
View File

@ -45,7 +45,7 @@
#include <wayland-server.h> #include <wayland-server.h>
#include "meta-xrandr-shared.h" #include "meta-xrandr-shared.h"
#include "meta-dbus-xrandr.h" #include "meta-dbus-display-config.h"
typedef struct _MetaMonitorManagerClass MetaMonitorManagerClass; typedef struct _MetaMonitorManagerClass MetaMonitorManagerClass;
typedef struct _MetaMonitorManager MetaMonitorManager; typedef struct _MetaMonitorManager MetaMonitorManager;