From f75afcc457f08549e378dfabc205dec5fa98e1c5 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Wed, 8 Feb 2012 00:24:32 -0500
Subject: Add DTD to hostname introspection xml file, and give it a better name

---
 Makefile.am        |  6 +++---
 data/hostname1.xml | 25 +++++++++++++++++++++++++
 data/hostnamed.xml | 24 ------------------------
 3 files changed, 28 insertions(+), 27 deletions(-)
 create mode 100644 data/hostname1.xml
 delete mode 100644 data/hostnamed.xml

diff --git a/Makefile.am b/Makefile.am
index 58a1dea..6b6cb78 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 EXTRA_DIST = \
-	data/hostnamed.xml \
+	data/hostname1.xml \
 	$(NULL)
 
 AM_CPPFLAGS = \
@@ -33,12 +33,12 @@ openrc_settingsd_SOURCES = \
 	src/main.c \
 	$(NULL)
 
-$(hostnamed_built_sources) : data/hostnamed.xml
+$(hostnamed_built_sources) : data/hostname1.xml
 	( $(GDBUS_CODEGEN) \
 	--interface-prefix org.freedesktop. \
 	--c-namespace OpenrcSettingsdHostnamed \
 	--generate-c-code hostnamed-generated \
-	$(srcdir)/data/hostnamed.xml; \
+	$(srcdir)/data/hostname1.xml; \
 	mv hostnamed-generated.{c,h} $(top_srcdir)/src/ )
 
 BUILT_SOURCES = $(hostnamed_built_sources)
diff --git a/data/hostname1.xml b/data/hostname1.xml
new file mode 100644
index 0000000..7a731f6
--- /dev/null
+++ b/data/hostname1.xml
@@ -0,0 +1,25 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/org/freedesktop/hostname1">
+    <interface name="org.freedesktop.hostname1">
+        <method name="SetHostname">
+            <arg direction="in" type="s" name="name"/>
+            <arg direction="in" type="b" name="user_interaction"/>
+        </method>
+        <method name="SetStaticHostname">
+            <arg direction="in" type="s" name="name"/>
+            <arg direction="in" type="b" name="user_interaction"/>
+        </method>
+        <method name="SetPrettyHostname">
+            <arg direction="in" type="s" name="name"/>
+            <arg direction="in" type="b" name="user_interaction"/>
+        </method>
+        <method name="SetIconName">
+            <arg direction="in" type="s" name="name"/>
+            <arg direction="in" type="b" name="user_interaction"/>
+        </method>
+        <property name="Hostname" type="s" access="read"/>
+        <property name="StaticHostname" type="s" access="read"/>
+        <property name="PrettyHostname" type="s" access="read"/>
+        <property name="IconName" type="s" access="read"/>
+    </interface>
+</node>
diff --git a/data/hostnamed.xml b/data/hostnamed.xml
deleted file mode 100644
index 80c0216..0000000
--- a/data/hostnamed.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<node name="/org/freedesktop/hostname1">
-    <interface name="org.freedesktop.hostname1">
-        <method name="SetHostname">
-            <arg direction="in" type="s" name="name"/>
-            <arg direction="in" type="b" name="user_interaction"/>
-        </method>
-        <method name="SetStaticHostname">
-            <arg direction="in" type="s" name="name"/>
-            <arg direction="in" type="b" name="user_interaction"/>
-        </method>
-        <method name="SetPrettyHostname">
-            <arg direction="in" type="s" name="name"/>
-            <arg direction="in" type="b" name="user_interaction"/>
-        </method>
-        <method name="SetIconName">
-            <arg direction="in" type="s" name="name"/>
-            <arg direction="in" type="b" name="user_interaction"/>
-        </method>
-        <property name="Hostname" type="s" access="read"/>
-        <property name="StaticHostname" type="s" access="read"/>
-        <property name="PrettyHostname" type="s" access="read"/>
-        <property name="IconName" type="s" access="read"/>
-    </interface>
-</node>
-- 
cgit v1.2.3-65-gdbad