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

* Included config.h in all headers

Browse source 
* Don't define DBUS_API_SUBJECT_TO_CHANGE unless for old D-Bus versions
* Use recursive mutex functions if libdbus supports it
* Specify the path when adding match rules, otherwise messages wouldn't be forwarded to the right object under some circumstances
* Added integration with the glib main loop (configure with --enable-glib)
* Added a gtkmm dbus-browser clone to demonstrate glib integration
* Fixed a typo in dbusxx-xml2cpp proxy output
* Added python usage instructions for the Echo example


git-svn-id: http://dev.openwengo.org/svn/openwengo/wengophone-ng/branches/wengophone-dbus-api/libs/dbus@10948 30a43799-04e7-0310-8b2b-ea0d24f86d0e
This commit is contained in:
pdurante 2007-04-29 01:17:32 +00:00
parent 771ca71556
commit 48a1be9f2a
37 changed files with 427 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
configure.ac
View file

@ -17,6 +17,12 @@ AC_ARG_ENABLE(debug,
enable_debug=$enableval,enable_debug=auto
)
AC_ARG_ENABLE(glib,
AS_HELP_STRING([--enable-glib],
[enable glib integration]),
enable_glib=$enableval,enable_debug=auto
)
AC_ARG_ENABLE(doxygen-docs,
AS_HELP_STRING([--enable-doxygen-docs],
[build DOXYGEN documentation (requires Doxygen)]),
@ -48,6 +54,32 @@ PKG_CHECK_MODULES([dbus], dbus-1 >= $DBUS_REQUIRED_VERSION,,
AC_SUBST(dbus_CFLAGS)
AC_SUBST(dbus_LIBS)
DBUS_API_STABLE_VERSION=1.0.0
PKG_CHECK_EXISTS(dbus-1 < $DBUS_API_STABLE_VERSION,
AC_DEFINE(DBUS_API_SUBJECT_TO_CHANGE, , [unstable DBus])
)
DBUS_RECURSIVE_MUTEX_VERSION=0.95
PKG_CHECK_EXISTS(dbus-1 >= $DBUS_RECURSIVE_MUTEX_VERSION,
AC_DEFINE(DBUS_HAS_RECURSIVE_MUTEX, , [DBus supports recursive mutexes (needs DBus >= 0.95)])
)
if test x$enable_glib = xyes ; then
PKG_CHECK_MODULES([glib], glib-2.0)
AC_SUBST(glib_CFLAGS)
AC_SUBST(glib_LIBS)
AM_CONDITIONAL(ENABLE_GLIB, test 1 = 1)
PKG_CHECK_MODULES([gtkmm], gtkmm-2.4,
AM_CONDITIONAL(HAVE_GTKMM, test 1 = 1),
AM_CONDITIONAL(HAVE_GTKMM, test 0 = 1)
)
AC_SUBST(gtkmm_CFLAGS)
AC_SUBST(gtkmm_LIBS)
else
AM_CONDITIONAL(ENABLE_GLIB, test 0 = 1)
AM_CONDITIONAL(HAVE_GTKMM, test 0 = 1)
fi
AC_CHECK_LIB([expat], XML_ParserCreate_MM,
[ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ],
have_expat=false)
@ -66,7 +98,7 @@ AC_SUBST(xml_LIBS)
if test x$enable_debug = xyes ; then
CXXFLAGS="-Wall -ggdb -O0 -DDEBUG"
else
CXXFLAGS="-Wall -O3 -DDEBUG"
CXXFLAGS="-Wall -O3"
fi
@ -122,5 +154,6 @@ AC_OUTPUT(
examples/properties/Makefile
examples/echo/Makefile
examples/hal/Makefile
examples/glib/Makefile
dbus-c++-1.pc
)

2
examples/Makefile.am
View file

@ -1,4 +1,4 @@
SUBDIRS = properties echo hal
SUBDIRS = properties echo hal glib
MAINTAINERCLEANFILES = \
Makefile.in

12
examples/echo/README
View file

@ -9,3 +9,15 @@ dbus-send --dest=org.freedesktop.DBus.Examples.Echo --type=method_call --print-r
dbus-send --dest=org.freedesktop.DBus.Examples.Echo --type=method_call --print-reply /org/freedesktop/DBus/Examples/Echo org.freedesktop.DBus.EchoDemo.Sum array:int32:10,100,250
dbus-send --dest=org.freedesktop.DBus.Examples.Echo --type=method_call --print-reply /org/freedesktop/DBus/Examples/Echo org.freedesktop.DBus.EchoDemo.Info
or, using python instead
$ python
import dbus
bus = dbus.SessionBus()
object = bus.get_object('org.freedesktop.DBus.Examples.Echo','/org/freedesktop/DBus/Examples/Echo')
echo = dbus.Interface(object, dbus_interface='org.freedesktop.DBus.EchoDemo')
echo.Random()
echo.Hello("world")
echo.Sum([123, 234, 95, 520])
echo.Info()

22
examples/glib/Makefile.am Normal file
View file

@ -0,0 +1,22 @@
EXTRA_DIST =
AM_CPPFLAGS = -I$(top_srcdir)/include $(gtkmm_CFLAGS)
if HAVE_GTKMM
noinst_PROGRAMS = dbus-browser
endif
dbus_browser_SOURCES = dbus-glue.h dbus-browser.h dbus-browser.cpp
dbus_browser_LDADD = $(top_builddir)/src/libdbus-c++-1.la $(gtkmm_LIBS)
dbus-glue.h: $(top_srcdir)/data/org.freedesktop.DBus.xml
$(top_builddir)/tools/dbusxx-xml2cpp $^ --proxy=$@
BUILT_SOURCES = dbus-glue.h
CLEANFILES = $(BUILT_SOURCES)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
MAINTAINERCLEANFILES = \
Makefile.in

135
examples/glib/dbus-browser.cpp Normal file
View file

@ -0,0 +1,135 @@
#include "dbus-browser.h"
#include <iostream>
using namespace std;
static const char* DBUS_SERVER_NAME = "org.freedesktop.DBus";
static const char* DBUS_SERVER_PATH = "/org/freedesktop/DBus";
DBusBrowser::DBusBrowser( ::DBus::Connection& conn )
: ::DBus::ObjectProxy(conn, DBUS_SERVER_PATH, DBUS_SERVER_NAME)
{
set_title("D-Bus Browser");
set_border_width(5);
set_default_size(400, 500);
typedef std::vector< ::DBus::String > Names;
Names names = ListNames();
for(Names::iterator it = names.begin(); it != names.end(); ++it)
{
_cb_busnames.append_text(*it);
}
_cb_busnames.signal_changed().connect( sigc::mem_fun(*this, &DBusBrowser::on_select_busname) );
_tm_inspect = Gtk::TreeStore::create(_records);
_tv_inspect.set_model(_tm_inspect);
_tv_inspect.append_column("Node", _records.name);
_sc_tree.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
_sc_tree.add(_tv_inspect);
_vbox.pack_start(_cb_busnames, Gtk::PACK_SHRINK);
_vbox.pack_start(_sc_tree);
add(_vbox);
show_all_children();
}
void DBusBrowser::NameOwnerChanged(
const ::DBus::String& name, const ::DBus::String& old_owner, const ::DBus::String& new_owner )
{
cout << name << ": " << old_owner << " -> " << new_owner << endl;
}
void DBusBrowser::NameLost( const ::DBus::String& name )
{
cout << name << " lost" << endl;
}
void DBusBrowser::NameAcquired( const ::DBus::String& name )
{
cout << name << " acquired" << endl;
}
void DBusBrowser::on_select_busname()
{
Glib::ustring busname = _cb_busnames.get_active_text();
if(busname.empty()) return;
_tm_inspect->clear();
_inspect_append(NULL, "", busname);
}
void DBusBrowser::_inspect_append( Gtk::TreeModel::Row* row, const std::string& buspath, const std::string& busname )
{
DBusInspector inspector(conn(), buspath.empty() ? "/" : buspath.c_str(), busname.c_str());
::DBus::Xml::Document doc(inspector.Introspect());
::DBus::Xml::Node& root = *(doc.root);
::DBus::Xml::Nodes ifaces = root["interface"];
for(::DBus::Xml::Nodes::iterator ii = ifaces.begin(); ii != ifaces.end(); ++ii)
{
::DBus::Xml::Node& iface = **ii;
Gtk::TreeModel::Row i_row = row
? *(_tm_inspect->append(row->children()))
: *(_tm_inspect->append());
i_row[_records.name] = "interface: " + iface.get("name");
::DBus::Xml::Nodes methods = iface["method"];
for(::DBus::Xml::Nodes::iterator im = methods.begin(); im != methods.end(); ++im)
{
Gtk::TreeModel::Row m_row = *(_tm_inspect->append(i_row.children()));
m_row[_records.name] = "method: " + (*im)->get("name");
}
::DBus::Xml::Nodes signals = iface["signal"];
for(::DBus::Xml::Nodes::iterator is = signals.begin(); is != signals.end(); ++is)
{
Gtk::TreeModel::Row s_row = *(_tm_inspect->append(i_row.children()));
s_row[_records.name] = "signal: " + (*is)->get("name");
}
}
::DBus::Xml::Nodes nodes = root["node"];
for(::DBus::Xml::Nodes::iterator in = nodes.begin(); in != nodes.end(); ++in)
{
std::string name = (*in)->get("name");
Gtk::TreeModel::Row n_row = row
? *(_tm_inspect->append(row->children()))
: *(_tm_inspect->append());
n_row[_records.name] = name;
_inspect_append(&n_row, buspath + "/" + name, busname);
}
}
DBus::Glib::BusDispatcher dispatcher;
int main(int argc, char* argv[])
{
Gtk::Main kit(argc, argv);
DBus::default_dispatcher = &dispatcher;
dispatcher.attach(NULL);
DBus::Connection conn = DBus::Connection::SessionBus();
DBusBrowser browser(conn);
Gtk::Main::run(browser);
return 0;
}

62
examples/glib/dbus-browser.h Normal file
View file

@ -0,0 +1,62 @@
#ifndef __DEMO_DBUS_BROWSER_H
#define __DEMO_DBUS_BROWSER_H
#include <dbus-c++/dbus.h>
#include <dbus-c++/glib-integration.h>
#include <gtkmm.h>
#include "dbus-glue.h"
class DBusInspector
: public DBus::IntrospectableProxy,
public DBus::ObjectProxy
{
public:
DBusInspector( DBus::Connection& conn, const char* path, const char* service )
: DBus::ObjectProxy(conn, path, service)
{}
};
class DBusBrowser
: public org::freedesktop::DBus,
public DBus::IntrospectableProxy,
public DBus::ObjectProxy,
public Gtk::Window
{
public:
DBusBrowser( ::DBus::Connection& );
private:
void NameOwnerChanged( const ::DBus::String&, const ::DBus::String&, const ::DBus::String& );
void NameLost( const ::DBus::String& );
void NameAcquired( const ::DBus::String& );
void on_select_busname();
void _inspect_append( Gtk::TreeModel::Row*, const std::string&, const std::string& );
private:
class InspectRecord : public Gtk::TreeModel::ColumnRecord
{
public:
InspectRecord() { add(name); }
Gtk::TreeModelColumn<Glib::ustring> name;
};
Gtk::VBox _vbox;
Gtk::ScrolledWindow _sc_tree;
Gtk::ComboBoxText _cb_busnames;
Gtk::TreeView _tv_inspect;
Glib::RefPtr<Gtk::TreeStore> _tm_inspect;
InspectRecord _records;
};
#endif//__DEMO_DBUS_BROWSER_H

6
include/dbus-c++/config.h.in
View file

@ -1,5 +1,11 @@
/* include/dbus-c++/config.h.in. Generated from configure.ac by autoheader. */
/* unstable DBus */
#undef DBUS_API_SUBJECT_TO_CHANGE
/* DBus supports recursive mutexes (needs DBus >= 0.95) */
#undef DBUS_HAS_RECURSIVE_MUTEX
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H

4
include/dbus-c++/connection.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_CONNECTION_H
#define __DBUSXX_CONNECTION_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <list>
#include "types.h"

4
include/dbus-c++/dbus.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_DBUS_H
#define __DBUSXX_DBUS_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "types.h"
#include "interface.h"
#include "object.h"

4
include/dbus-c++/debug.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_DEBUG_H
#define __DBUSXX_DEBUG_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
namespace DBus {
typedef void (*LogFunction)(const char* format, ...);

16
include/dbus-c++/dispatcher.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_DISPATCHER_H
#define __DBUSXX_DISPATCHER_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "connection.h"
namespace DBus {
@ -126,9 +130,9 @@ public:
virtual ~Mutex() {}
virtual bool lock() = 0;
virtual void lock() = 0;
virtual bool unlock() = 0;
virtual void unlock() = 0;
struct Internal;
@ -158,10 +162,18 @@ protected:
Internal* _int;
};
#ifndef DBUS_HAS_RECURSIVE_MUTEX
typedef Mutex* (*MutexNewFn)();
typedef bool (*MutexFreeFn)( Mutex* mx );
typedef bool (*MutexLockFn)( Mutex* mx );
typedef void (*MutexUnlockFn)( Mutex* mx );
#else
typedef Mutex* (*MutexNewFn)();
typedef void (*MutexFreeFn)( Mutex* mx );
typedef void (*MutexLockFn)( Mutex* mx );
typedef void (*MutexUnlockFn)( Mutex* mx );
#endif//DBUS_HAS_RECURSIVE_MUTEX
typedef CondVar* (*CondVarNewFn)();
typedef void (*CondVarFreeFn)( CondVar* cv );
typedef void (*CondVarWaitFn)( CondVar* cv, Mutex* mx );

4
include/dbus-c++/error.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_ERROR_H
#define __DBUSXX_ERROR_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "util.h"
#include <exception>

4
include/dbus-c++/eventloop.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_EVENTLOOP_H
#define __DBUSXX_EVENTLOOP_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <list>
#include "dispatcher.h"

4
include/dbus-c++/interface.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_INTERFACE_H
#define __DBUSXX_INTERFACE_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string>
#include <map>
#include "util.h"

4
include/dbus-c++/introspection.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_INTROSPECTION_H
#define __DBUSXX_INTROSPECTION_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "interface.h"
namespace DBus {

4
include/dbus-c++/message.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_MESSAGE_H
#define __DBUSXX_MESSAGE_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string>
#include <map>

4
include/dbus-c++/object.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_OBJECT_H
#define __DBUSXX_OBJECT_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string>
#include <list>

4
include/dbus-c++/pendingcall.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_PENDING_CALL_H
#define __DBUSXX_PENDING_CALL_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "util.h"
namespace DBus {

4
include/dbus-c++/property.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_PROPERTY_H
#define __DBUSXX_PROPERTY_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "types.h"
#include "interface.h"

4
include/dbus-c++/refptr_impl.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_REFPTR_IMPL_H
#define __DBUSXX_REFPTR_IMPL_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "util.h"
namespace DBus {

4
include/dbus-c++/server.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_SERVER_H
#define __DBUSXX_SERVER_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <list>
#include "error.h"

4
include/dbus-c++/types.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_TYPES_H
#define __DBUSXX_TYPES_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string>
#include <vector>
#include <map>

4
include/dbus-c++/util.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_UTIL_H
#define __DBUSXX_UTIL_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "debug.h"
namespace DBus {

4
include/dbus-c++/xml.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_XML_H
#define __DBUSXX_XML_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <exception>
#include <string>
#include <vector>

16
src/Makefile.am
View file

@ -1,8 +1,13 @@
AM_CPPFLAGS = \
$(dbus_CFLAGS) \
$(xml_CFLAGS) \
-I$(top_srcdir)/include \
-DDBUS_API_SUBJECT_TO_CHANGE
$(glib_CFLAGS) \
-I$(top_srcdir)/include
if ENABLE_GLIB
GLIB_H = $(HEADER_DIR)/glib-integration.h
GLIB_CPP = glib-integration.cpp
endif
HEADER_DIR = $(top_srcdir)/include/dbus-c++
HEADER_FILES = \
@ -24,14 +29,15 @@ HEADER_FILES = \
$(HEADER_DIR)/util.h \
$(HEADER_DIR)/refptr_impl.h \
$(HEADER_DIR)/xml.h \
$(HEADER_DIR)/introspection.h
$(HEADER_DIR)/introspection.h \
$(GLIB_H)
lib_includedir=$(includedir)/dbus-c++-1/dbus-c++/
lib_include_HEADERS = $(HEADER_FILES)
lib_LTLIBRARIES = libdbus-c++-1.la
libdbus_c___1_la_SOURCES = $(HEADER_FILES) interface.cpp object.cpp introspection.cpp debug.cpp eventloop.cpp xml.cpp types.cpp connection.cpp connection_p.h property.cpp dispatcher.cpp dispatcher_p.h pendingcall.cpp pendingcall_p.h error.cpp internalerror.h message.cpp message_p.h server.cpp server_p.h
libdbus_c___1_la_LIBADD = $(dbus_LIBS) $(xml_LIBS)
libdbus_c___1_la_SOURCES = $(HEADER_FILES) interface.cpp object.cpp introspection.cpp debug.cpp eventloop.cpp xml.cpp types.cpp connection.cpp connection_p.h property.cpp dispatcher.cpp dispatcher_p.h pendingcall.cpp pendingcall_p.h error.cpp internalerror.h message.cpp message_p.h server.cpp server_p.h $(GLIB_CPP)
libdbus_c___1_la_LIBADD = $(dbus_LIBS) $(xml_LIBS) $(glib_LIBS)
MAINTAINERCLEANFILES = \
Makefile.in

4
src/connection_p.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_CONNECTION_P_H
#define __DBUSXX_CONNECTION_P_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <dbus-c++/connection.h>
#include <dbus-c++/server.h>
#include <dbus-c++/dispatcher.h>

26
src/dispatcher.cpp
View file

@ -181,6 +181,7 @@ void DBus::_init_threading(
CondVarWakeAllFn c6
)
{
#ifndef DBUS_HAS_RECURSIVE_MUTEX
DBusThreadFunctions functions = {
DBUS_THREAD_FUNCTIONS_MUTEX_NEW_MASK |
DBUS_THREAD_FUNCTIONS_MUTEX_FREE_MASK |
@ -203,5 +204,30 @@ void DBus::_init_threading(
(DBusCondVarWakeOneFunction) c5,
(DBusCondVarWakeAllFunction) c6
};
#else
DBusThreadFunctions functions = {
DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_NEW_MASK |
DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_FREE_MASK |
DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_LOCK_MASK |
DBUS_THREAD_FUNCTIONS_RECURSIVE_MUTEX_UNLOCK_MASK |
DBUS_THREAD_FUNCTIONS_CONDVAR_NEW_MASK |
DBUS_THREAD_FUNCTIONS_CONDVAR_FREE_MASK |
DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_MASK |
DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_TIMEOUT_MASK |
DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ONE_MASK|
DBUS_THREAD_FUNCTIONS_CONDVAR_WAKE_ALL_MASK,
0, 0, 0, 0,
(DBusCondVarNewFunction) c1,
(DBusCondVarFreeFunction) c2,
(DBusCondVarWaitFunction) c3,
(DBusCondVarWaitTimeoutFunction) c4,
(DBusCondVarWakeOneFunction) c5,
(DBusCondVarWakeAllFunction) c6,
(DBusRecursiveMutexNewFunction) m1,
(DBusRecursiveMutexFreeFunction) m2,
(DBusRecursiveMutexLockFunction) m3,
(DBusRecursiveMutexUnlockFunction) m4
};
#endif//DBUS_HAS_RECURSIVE_MUTEX
dbus_threads_init(&functions);
}

4
src/dispatcher_p.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_DISPATCHER_P_H
#define __DBUSXX_DISPATCHER_P_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <dbus-c++/dispatcher.h>
#include <dbus/dbus.h>

4
src/internalerror.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_INTERNALERROR_H
#define __DBUSXX_INTERNALERROR_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <dbus-c++/error.h>
#include <dbus/dbus.h>

4
src/message_p.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_MESSAGE_P_H
#define __DBUSXX_MESSAGE_P_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <dbus-c++/message.h>
#include <dbus-c++/refptr_impl.h>

17
src/object.cpp
View file

@ -143,7 +143,7 @@ void ObjectAdaptor::register_obj()
InterfaceAdaptorTable::const_iterator ii = _interfaces.begin();
while( ii != _interfaces.end() )
{
std::string im = "type='method_call',interface='"+ii->first+"'";
std::string im = "type='method_call',interface='"+ii->first+"',path='"+path()+"'";
conn().add_match(im.c_str());
++ii;
}
@ -163,7 +163,7 @@ void ObjectAdaptor::unregister_obj()
InterfaceAdaptorTable::const_iterator ii = _interfaces.begin();
while( ii != _interfaces.end() )
{
std::string im = "type='method_call',interface='"+ii->first+"'";
std::string im = "type='method_call',interface='"+ii->first+"',path='"+path()+"'";
conn().remove_match(im.c_str());
++ii;
}
@ -290,13 +290,10 @@ void ObjectProxy::register_obj()
InterfaceProxyTable::const_iterator ii = _interfaces.begin();
while( ii != _interfaces.end() )
{
std::string im = "type='signal',interface='"+ii->first+"'";
std::string im = "type='signal',interface='"+ii->first+"',path='"+path()+"'";
conn().add_match(im.c_str());
++ii;
}
// conn().add_match("type='signal'");
// conn().add_match("type='method_call'");
}
void ObjectProxy::unregister_obj()
@ -306,13 +303,10 @@ void ObjectProxy::unregister_obj()
InterfaceProxyTable::const_iterator ii = _interfaces.begin();
while( ii != _interfaces.end() )
{
std::string im = "type='signal',interface='"+ii->first+"'";
std::string im = "type='signal',interface='"+ii->first+"',path='"+path()+"'";
conn().remove_match(im.c_str());
++ii;
}
// conn().remove_match("type='method_call'");
// conn().remove_match("type='signal'");
conn().remove_filter(_filtered);
}
@ -334,7 +328,8 @@ bool ObjectProxy::handle_message( const Message& msg )
const char* interface = smsg.interface();
const char* member = smsg.member();
debug_log("filtered signal %s(in %s) from remote object %s", member, interface, msg.sender());
debug_log("filtered signal %s(in %s) from remote object %s",
member, interface, msg.sender());
InterfaceProxy* ii = find_interface(interface);
if( ii )

4
src/pendingcall_p.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_PENDING_CALL_P_H
#define __DBUSXX_PENDING_CALL_P_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <dbus-c++/pendingcall.h>
#include <dbus-c++/refptr_impl.h>

4
src/server_p.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_SERVER_P_H
#define __DBUSXX_SERVER_P_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <dbus-c++/server.h>
#include <dbus-c++/dispatcher.h>
#include <dbus-c++/refptr_impl.h>

3
tools/Makefile.am
View file

@ -4,8 +4,7 @@ CXX = $(CXX_FOR_BUILD)
AM_CPPFLAGS = \
$(dbus_CFLAGS) \
-I$(top_srcdir)/include \
-DDBUS_API_SUBJECT_TO_CHANGE
-I$(top_srcdir)/include
if CROSS_COMPILING
libdbus_cxx_la = $(BUILD_LIBDBUS_CXX_DIR)/src/libdbus-c++-1.la

4
tools/introspect.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_TOOLS_INTROSPECT_H
#define __DBUSXX_TOOLS_INTROSPECT_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <dbus-c++/dbus.h>
#include <string>

2
tools/xml2cpp.cpp
View file

@ -353,7 +353,7 @@ void generate_proxy( Xml::Document& doc, const char* filename )
if(arg_name.length())
file << tab << tab << "wi << " << arg_name << ";" << endl;
else
file << tab << tab << "wi << argout" << j << ";" << endl;
file << tab << tab << "wi << argin" << j << ";" << endl;
}
file << tab << tab << "call.member(\"" << method.get("name") << "\");" << endl

4
tools/xml2cpp.h
View file

@ -25,6 +25,10 @@
#ifndef __DBUSXX_TOOLS_XML2CPP_H
#define __DBUSXX_TOOLS_XML2CPP_H
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <dbus-c++/dbus.h>
#include <dbus/dbus.h>