jeena/dbus-cplusplus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

moved the D-Bus component into its own thread.

Browse source 
various API changes and fixes.


git-svn-id: http://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs/dbus@7852 30a43799-04e7-0310-8b2b-ea0d24f86d0e
This commit is contained in:
pdurante 2006-10-01 13:37:47 +00:00
parent 42ea920aeb
commit 24637001ce
9 changed files with 77 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/object.cpp
View file

@ -175,11 +175,6 @@ void ObjectAdaptor::_emit_signal( SignalMessage& sig )
conn().send(sig);
}
struct WontReturnException
{
const void* tag;
};
bool ObjectAdaptor::handle_message( const Message& msg )
{
switch( msg.type() )
@ -205,9 +200,9 @@ bool ObjectAdaptor::handle_message( const Message& msg )
ErrorMessage em(cmsg, e.name(), e.message());
conn().send(em);
}
catch(WontReturnException& wre)
catch(Tag* tag)
{
_continuations[wre.tag] = new Continuation(conn(), cmsg, wre.tag);
_continuations[tag] = new Continuation(conn(), cmsg, tag);
}
return true;
}
@ -223,11 +218,9 @@ bool ObjectAdaptor::handle_message( const Message& msg )
}
}
void ObjectAdaptor::return_later( const void* tag )
void ObjectAdaptor::return_later( const Tag* tag )
{
WontReturnException wre = { tag };
throw wre;
throw tag;
}
void ObjectAdaptor::return_now( Continuation* ret )
@ -252,14 +245,14 @@ void ObjectAdaptor::return_error( Continuation* ret, const Error error )
_continuations.erase(di);
}
ObjectAdaptor::Continuation* ObjectAdaptor::find_continuation( const void* tag )
ObjectAdaptor::Continuation* ObjectAdaptor::find_continuation( const Tag* tag )
{
ContinuationMap::iterator di = _continuations.find(tag);
return di != _continuations.end() ? di->second : NULL;
}
ObjectAdaptor::Continuation::Continuation( Connection& conn, const CallMessage& call, const void* tag )
ObjectAdaptor::Continuation::Continuation( Connection& conn, const CallMessage& call, const Tag* tag )
: _conn(conn), _call(call), _return(_call), _tag(tag)
{
_writer = _return.writer(); //todo: verify