* Included config.h in all headers
* 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:
parent
771ca71556
commit
48a1be9f2a
37 changed files with 427 additions and 23 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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, ...);
|
||||
|
|
|
@ -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 );
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -25,6 +25,10 @@
|
|||
#ifndef __DBUSXX_MESSAGE_H
|
||||
#define __DBUSXX_MESSAGE_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
#include <map>
|
||||
|
||||
|
|
|
@ -25,6 +25,10 @@
|
|||
#ifndef __DBUSXX_OBJECT_H
|
||||
#define __DBUSXX_OBJECT_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <string>
|
||||
#include <list>
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue