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

8
src/server_p.h
View file

@ -40,17 +40,17 @@ namespace DBus {
struct DXXAPILOCAL Server::Private
{
DBusServer* server;
DBusServer *server;
Dispatcher* dispatcher;
Dispatcher *dispatcher;
ConnectionList connections;
Private( DBusServer* );
Private(DBusServer *);
~Private();
static void on_new_conn_cb( DBusServer* server, DBusConnection* conn, void* data );
static void on_new_conn_cb(DBusServer *server, DBusConnection *conn, void *data);
};
} /* namespace DBus */