* 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
|
@ -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);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue