summaryrefslogtreecommitdiff
path: root/registryd
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@gnome.org>2022-12-08 10:47:03 -0600
committerFederico Mena Quintero <federico@gnome.org>2022-12-08 10:47:03 -0600
commit2d0a17a314cf3e2528d461b497b1318d14a3ce97 (patch)
tree8eb2b3827b012b89050bff039019584133a027a6 /registryd
parent9bc3842dc307e2ae683c0a2ce4673ac6dd94ff5a (diff)
downloadat-spi2-core-2d0a17a314cf3e2528d461b497b1318d14a3ce97.tar.gz
Rename de-marshaller.[ch] to marshal-dbus.[ch]
I'll put all the libdbus-based marshallers in that file. Later I want to have a marshal-gdbus.[ch] counterpart, to let us port things gradually to gdbus.
Diffstat (limited to 'registryd')
-rw-r--r--registryd/deviceeventcontroller-x11.c2
-rw-r--r--registryd/deviceeventcontroller.c2
-rw-r--r--registryd/marshal-dbus.c (renamed from registryd/de-marshaller.c)0
-rw-r--r--registryd/marshal-dbus.h (renamed from registryd/de-marshaller.h)0
-rw-r--r--registryd/meson.build6
5 files changed, 5 insertions, 5 deletions
diff --git a/registryd/deviceeventcontroller-x11.c b/registryd/deviceeventcontroller-x11.c
index d5cae611..b330c51e 100644
--- a/registryd/deviceeventcontroller-x11.c
+++ b/registryd/deviceeventcontroller-x11.c
@@ -42,11 +42,11 @@
#include <dbus/dbus.h>
-#include "de-marshaller.h"
#include "de-types.h"
#include "display.h"
#include "event-source.h"
#include "keymasks.h"
+#include "marshal-dbus.h"
#include "paths.h"
#include "deviceeventcontroller.h"
diff --git a/registryd/deviceeventcontroller.c b/registryd/deviceeventcontroller.c
index 466bae22..0d89114a 100644
--- a/registryd/deviceeventcontroller.c
+++ b/registryd/deviceeventcontroller.c
@@ -38,9 +38,9 @@
#include <dbus/dbus.h>
-#include "de-marshaller.h"
#include "de-types.h"
#include "keymasks.h"
+#include "marshal-dbus.h"
#include "paths.h"
#include "deviceeventcontroller.h"
diff --git a/registryd/de-marshaller.c b/registryd/marshal-dbus.c
index 8c65bfe7..8c65bfe7 100644
--- a/registryd/de-marshaller.c
+++ b/registryd/marshal-dbus.c
diff --git a/registryd/de-marshaller.h b/registryd/marshal-dbus.h
index ddaf1360..ddaf1360 100644
--- a/registryd/de-marshaller.h
+++ b/registryd/marshal-dbus.h
diff --git a/registryd/meson.build b/registryd/meson.build
index 961372cf..dfbbe5ce 100644
--- a/registryd/meson.build
+++ b/registryd/meson.build
@@ -2,11 +2,11 @@ atspi_introspection_path = ''
registryd_sources = [
introspection_generated,
- 'de-marshaller.c',
- 'registry-main.c',
- 'registry.c',
'deviceeventcontroller.c',
+ 'marshal-dbus.c',
'reentrant-list.c',
+ 'registry-main.c',
+ 'registry.c',
]
registryd_deps = [