* Nested objects introspection patch (David Belser)
* More indentation in generated code (David Belser) * Avoid redundant calls to dbus_bus_add_match (David Belser) * Typo in HAVE_PTHREAD_H macro (Olivier Hochreutiner) * Allow other listeners to receive the same signal, if any (Olivier Hochreutiner)
This commit is contained in:
parent
ecd2428049
commit
68a722e6d1
10 changed files with 89 additions and 64 deletions
|
@ -29,7 +29,7 @@
|
|||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_PTHREAD
|
||||
#ifdef HAVE_PTHREAD_H
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
|
@ -143,9 +143,9 @@ public:
|
|||
|
||||
private:
|
||||
|
||||
#if defined HAVE_PTHREAD
|
||||
#if defined HAVE_PTHREAD_H
|
||||
|
||||
pthread_mutex _mutex;
|
||||
pthread_mutex_t _mutex;
|
||||
|
||||
#elif defined HAVE_WIN32
|
||||
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
#include <glib.h>
|
||||
|
||||
#include "api.h"
|
||||
#include "eventloop.h"
|
||||
#include "dispatcher.h"
|
||||
|
||||
namespace DBus {
|
||||
|
||||
|
|
|
@ -104,6 +104,7 @@ public:
|
|||
class ObjectAdaptor;
|
||||
|
||||
typedef std::list<ObjectAdaptor*> ObjectAdaptorPList;
|
||||
typedef std::list<std::string> ObjectPathList;
|
||||
|
||||
class DXXAPI ObjectAdaptor : public Object, public virtual AdaptorBase
|
||||
{
|
||||
|
@ -113,6 +114,8 @@ public:
|
|||
|
||||
static ObjectAdaptorPList from_path_prefix( const std::string& prefix );
|
||||
|
||||
static ObjectPathList child_nodes_from_prefix( const std::string& prefix );
|
||||
|
||||
struct Private;
|
||||
|
||||
ObjectAdaptor( Connection& conn, const Path& path );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue