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

16
src/connection_p.h
View file

@ -43,30 +43,30 @@ namespace DBus {
struct DXXAPILOCAL Connection::Private
{
DBusConnection* conn;
DBusConnection * conn;
std::vector<std::string> names;
Dispatcher* dispatcher;
Dispatcher *dispatcher;
bool do_dispatch();
MessageSlot disconn_filter;
bool disconn_filter_function( const Message& );
bool disconn_filter_function(const Message &);
Server::Private* server;
Server::Private *server;
void detach_server();
Private( DBusConnection*, Server::Private* = NULL );
Private(DBusConnection *, Server::Private * = NULL);
Private( DBusBusType );
Private(DBusBusType);
~Private();
void init();
static void dispatch_status_stub( DBusConnection*, DBusDispatchStatus, void* );
static void dispatch_status_stub(DBusConnection *, DBusDispatchStatus, void *);
static DBusHandlerResult message_filter_stub( DBusConnection*, DBusMessage*, void* );
static DBusHandlerResult message_filter_stub(DBusConnection *, DBusMessage *, void *);
};
} /* namespace DBus */