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

merge from official dbus-c++ fd.org repo

Browse source 
Merge git://anongit.freedesktop.org/git/dbus/dbus-c++

Conflicts:

	configure.ac
	examples/Makefile.am
This commit is contained in:
Andreas Volz 2008-08-30 11:06:07 +02:00
commit fc54ec2a0b
17 changed files with 275 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/echo/Makefile.am
View file

@ -10,9 +10,7 @@ echo_server_LDADD = $(top_builddir)/src/libdbus-c++-1.la
echo-server-glue.h: echo-introspect.xml
$(top_builddir)/tools/dbusxx-xml2cpp $^ --adaptor=$@
if HAVE_PTHREAD
noinst_PROGRAMS += echo-client-mt
endif
echo_client_mt_SOURCES = echo-client-glue.h echo-client.h echo-client.cpp
echo_client_mt_LDADD = $(top_builddir)/src/libdbus-c++-1.la @PTHREAD_LIBS@

2
examples/echo/echo-client.h
View file

@ -5,7 +5,7 @@
#include "echo-client-glue.h"
class EchoClient
: public org::freedesktop::DBus::EchoDemo,
: public org::freedesktop::DBus::EchoDemo_proxy,
public DBus::IntrospectableProxy,
public DBus::ObjectProxy
{

2
examples/echo/echo-server.h
View file

@ -5,7 +5,7 @@
#include "echo-server-glue.h"
class EchoServer
: public org::freedesktop::DBus::EchoDemo,
: public org::freedesktop::DBus::EchoDemo_adaptor,
public DBus::IntrospectableAdaptor,
public DBus::ObjectAdaptor
{