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

Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++

Browse source 
Merge branch 'master' of git://anongit.freedesktop.org/git/dbus/dbus-c++

Conflicts:

	include/dbus-c++/connection.h
	include/dbus-c++/dispatcher.h
	include/dbus-c++/pendingcall.h
	src/dispatcher.cpp
This commit is contained in:
Andreas Volz 2008-08-14 23:59:23 +02:00
commit c1970e2352
57 changed files with 1642 additions and 1638 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/server.cpp
View file

@ -36,7 +36,7 @@
using namespace DBus;
Server::Private::Private( DBusServer* s )
Server::Private::Private(DBusServer *s)
: server(s)
{
}
@ -45,9 +45,9 @@ Server::Private::~Private()
{
}
void Server::Private::on_new_conn_cb( DBusServer* server, DBusConnection* conn, void* data )
void Server::Private::on_new_conn_cb(DBusServer *server, DBusConnection *conn, void *data)
{
Server* s = static_cast<Server*>(data);
Server *s = static_cast<Server *>(data);
Connection nc (new Connection::Private(conn, s->_pvt.get()));
@ -58,12 +58,12 @@ void Server::Private::on_new_conn_cb( DBusServer* server, DBusConnection* conn,
debug_log("incoming connection 0x%08x", conn);
}
Server::Server( const char* address )
Server::Server(const char *address)
{
InternalError e;
DBusServer* server = dbus_server_listen(address, e);
DBusServer *server = dbus_server_listen(address, e);
if(e) throw Error(e);
if (e) throw Error(e);
debug_log("server 0x%08x listening on %s", server, address);
@ -74,7 +74,7 @@ Server::Server( const char* address )
setup(default_dispatcher);
}
/*
Server::Server( const Server& s )
Server::Server(const Server &s)
: _pvt(s._pvt)
{
dbus_server_ref(_pvt->server);
@ -85,11 +85,11 @@ Server::~Server()
dbus_server_unref(_pvt->server);
}
Dispatcher* Server::setup( Dispatcher* dispatcher )
Dispatcher *Server::setup(Dispatcher *dispatcher)
{
debug_log("registering stubs for server %p", _pvt->server);
Dispatcher* prev = _pvt->dispatcher;
Dispatcher *prev = _pvt->dispatcher;
dbus_server_set_watch_functions(
_pvt->server,
@ -114,7 +114,7 @@ Dispatcher* Server::setup( Dispatcher* dispatcher )
return prev;
}
bool Server::operator == ( const Server& s ) const
bool Server::operator == (const Server &s) const
{
return _pvt->server == s._pvt->server;
}