Merge pull request #4 from trishume/D2.069.2

Update for latest D
This commit is contained in:
Tristan Hume 2016-03-11 17:35:28 -05:00
commit 21d36af507
2 changed files with 9 additions and 5 deletions

View file

@ -9,3 +9,7 @@ end
task :testSignal do task :testSignal do
sh "dbus-send --dest=ca.thume.ddbus.test /signaler ca.thume.test.signal int32:9" sh "dbus-send --dest=ca.thume.ddbus.test /signaler ca.thume.test.signal int32:9"
end end
task :testDbus do
sh "dbus-send --session --dest=org.freedesktop.DBus --type=method_call --print-reply /org/freedesktop/DBus org.freedesktop.DBus.ListNames"
end

View file

@ -122,8 +122,8 @@ class MessageRouter {
string introspectXML(string path) { string introspectXML(string path) {
auto methods = callTable.byKey().filter!(a => (a.path == path) && !a.signal)().array() auto methods = callTable.byKey().filter!(a => (a.path == path) && !a.signal)().array()
// .schwartzSort!((a) => a.iface, "a<b")(); // .schwartzSort!((a) => a.iface, "a<b")();
.sort!((a,b) => a.iface < b.iface)().release(); .sort!((a,b) => a.iface < b.iface)();
auto ifaces = groupBy!((a) => a.iface)(methods); auto ifaces = methods.groupBy();
auto app = appender!string; auto app = appender!string;
formattedWrite(app,introspectHeader,path); formattedWrite(app,introspectHeader,path);
foreach(iface; ifaces) { foreach(iface; ifaces) {