[Telepathy-commits] [telepathy-qt4/master] Move the Stream Engine XML into TelepathyQt4/Prototype

[Simon McVittie]

---
 TelepathyQt4/Prototype/Makefile.am       |    3 +-
 TelepathyQt4/Prototype/Stream_Engine.xml |   44 ++++++++++++++++++++++++++++++
 TelepathyQt4/Prototype/stream-engine.xml |    2 +-
 spec/Stream_Engine.xml                   |   44 ------------------------------
 4 files changed, 47 insertions(+), 46 deletions(-)
 create mode 100644 TelepathyQt4/Prototype/Stream_Engine.xml
 delete mode 100644 spec/Stream_Engine.xml

diff --git a/TelepathyQt4/Prototype/Makefile.am b/TelepathyQt4/Prototype/Makefile.am
index aa32f97..ef70904 100644
--- a/TelepathyQt4/Prototype/Makefile.am
+++ b/TelepathyQt4/Prototype/Makefile.am
@@ -8,7 +8,8 @@ pkgconfig_DATA = TpQt4Prototype.pc
 EXTRA_DIST = \
     all.xml \
     channel-handler.xml \
-    stream-engine.xml
+    stream-engine.xml \
+    Stream_Engine.xml
 
 lib_LTLIBRARIES = libtpqt4-prototype.la
 
diff --git a/TelepathyQt4/Prototype/Stream_Engine.xml b/TelepathyQt4/Prototype/Stream_Engine.xml
new file mode 100644
index 0000000..0303a51
--- /dev/null
+++ b/TelepathyQt4/Prototype/Stream_Engine.xml
@@ -0,0 +1,44 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/Stream_Engine">
+  <interface name="org.freedesktop.Telepathy.StreamEngine">
+    <method name="SetOutputVolume">
+      <arg direction="in" type="o" name="channel_path" />
+      <arg direction="in" type="u" name="stream_id" />
+      <arg direction="in" type="u" name="volume" />
+    </method>
+    <method name="MuteInput">
+      <arg direction="in" type="o" name="channel_path" />
+      <arg direction="in" type="u" name="stream_id" />
+      <arg direction="in" type="b" name="mute_state" />
+    </method>
+    <method name="MuteOutput">
+      <arg direction="in" type="o" name="channel_path" />
+      <arg direction="in" type="u" name="stream_id" />
+      <arg direction="in" type="b" name="mute_state" />
+    </method>
+    <method name="SetOutputWindow">
+      <arg direction="in" type="o" name="channel_path" />
+      <arg direction="in" type="u" name="stream_id" />
+      <arg direction="in" type="u" name="window" />
+    </method>
+    <method name="AddPreviewWindow">
+      <arg direction="in" type="u" name="window" />
+    </method>
+    <method name="RemovePreviewWindow">
+      <arg direction="in" type="u" name="window" />
+    </method>
+    <signal name="Receiving">
+      <arg type="o" name="channel_path" />
+      <arg type="u" name="stream_id" />
+      <arg type="b" name="state" />
+    </signal>
+    <signal name="StreamStateChanged">
+      <arg type="o" name="channel_path" />
+      <arg type="u" name="stream_id" />
+      <arg type="u" name="state" />
+      <arg type="u" name="direction" />
+    </signal>
+    <method name="Shutdown">
+    </method>
+  </interface>
+</node>
diff --git a/TelepathyQt4/Prototype/stream-engine.xml b/TelepathyQt4/Prototype/stream-engine.xml
index 2217b98..ec33bce 100644
--- a/TelepathyQt4/Prototype/stream-engine.xml
+++ b/TelepathyQt4/Prototype/stream-engine.xml
@@ -4,6 +4,6 @@
 
 <tp:title>Private stream engine interface</tp:title>
 
-<xi:include href="../../spec/Stream_Engine.xml"/>
+<xi:include href="Stream_Engine.xml"/>
 
 </tp:spec>
diff --git a/spec/Stream_Engine.xml b/spec/Stream_Engine.xml
deleted file mode 100644
index 0303a51..0000000
--- a/spec/Stream_Engine.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/Stream_Engine">
-  <interface name="org.freedesktop.Telepathy.StreamEngine">
-    <method name="SetOutputVolume">
-      <arg direction="in" type="o" name="channel_path" />
-      <arg direction="in" type="u" name="stream_id" />
-      <arg direction="in" type="u" name="volume" />
-    </method>
-    <method name="MuteInput">
-      <arg direction="in" type="o" name="channel_path" />
-      <arg direction="in" type="u" name="stream_id" />
-      <arg direction="in" type="b" name="mute_state" />
-    </method>
-    <method name="MuteOutput">
-      <arg direction="in" type="o" name="channel_path" />
-      <arg direction="in" type="u" name="stream_id" />
-      <arg direction="in" type="b" name="mute_state" />
-    </method>
-    <method name="SetOutputWindow">
-      <arg direction="in" type="o" name="channel_path" />
-      <arg direction="in" type="u" name="stream_id" />
-      <arg direction="in" type="u" name="window" />
-    </method>
-    <method name="AddPreviewWindow">
-      <arg direction="in" type="u" name="window" />
-    </method>
-    <method name="RemovePreviewWindow">
-      <arg direction="in" type="u" name="window" />
-    </method>
-    <signal name="Receiving">
-      <arg type="o" name="channel_path" />
-      <arg type="u" name="stream_id" />
-      <arg type="b" name="state" />
-    </signal>
-    <signal name="StreamStateChanged">
-      <arg type="o" name="channel_path" />
-      <arg type="u" name="stream_id" />
-      <arg type="u" name="state" />
-      <arg type="u" name="direction" />
-    </signal>
-    <method name="Shutdown">
-    </method>
-  </interface>
-</node>
-- 
1.5.6.5