It's not crashing anymore. Now I can shuffle the data forth and back over D-Bus! Yeehaa!master
parent
515f833785
commit
2b19057dc1
@ -1,31 +1,46 @@
|
||||
#include "pEpDBusMessage.h"
|
||||
#include <iostream>
|
||||
|
||||
pEpDBusMessage::pEpDBusMessage()
|
||||
pEpDBusMessage::pEpDBusMessage() : DBus::Variant::Variant()
|
||||
{
|
||||
writer().new_variant("s");
|
||||
}
|
||||
|
||||
pEpDBusMessage::pEpDBusMessage(message m)
|
||||
pEpDBusMessage::pEpDBusMessage(message m) : DBus::Variant::Variant()
|
||||
{
|
||||
writer().new_variant("s");
|
||||
}
|
||||
|
||||
DBus::Variant& operator<<(DBus::Variant&, const pEpDBusMessage&)
|
||||
DBus::Variant& operator>>(DBus::Variant &v, const pEpDBusMessage &m)
|
||||
{
|
||||
DBus::Variant ret;
|
||||
// TODO Copy the writer over to the other variant
|
||||
return ret;
|
||||
DBus::MessageIter to = m.writer();
|
||||
v.reader().copy_data(to);
|
||||
return v;
|
||||
}
|
||||
|
||||
DBus::Variant& operator<<(DBus::Variant &v, const pEpDBusMessage &m)
|
||||
{
|
||||
DBus::MessageIter to = v.writer();
|
||||
m.reader().copy_data(to);
|
||||
return v;
|
||||
}
|
||||
|
||||
message& pEpDBusMessage::operator >> (message &m)
|
||||
{
|
||||
//m.from->address << reader();
|
||||
m.from->address = writer().get_string();
|
||||
return m;
|
||||
}
|
||||
|
||||
DBus::Variant& pEpDBusMessage::operator << (DBus::Variant &v)
|
||||
{
|
||||
DBus::MessageIter to = writer();
|
||||
v.reader().copy_data(to);
|
||||
return v;
|
||||
}
|
||||
|
||||
message& pEpDBusMessage::operator << (message &m)
|
||||
{
|
||||
writer().append_string("test");
|
||||
//writer().append_string(m.from->address);
|
||||
writer().append_string(m.from->address);
|
||||
return m;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in new issue