diff -urN dbus-0.34.orig/qt/dbus-qthread.cpp dbus-0.34/qt/dbus-qthread.cpp
--- dbus-0.34.orig/qt/dbus-qthread.cpp	2003-12-02 13:44:22 +0300
+++ dbus-0.34/qt/dbus-qthread.cpp	2005-07-12 17:13:44 +0400
@@ -23,6 +23,7 @@
 
 #include <dbus/dbus.h>
 #include <qmutex.h>
+#include <qwaitcondition.h>
 
 #if defined(QT_THREAD_SUPPORT)
 
@@ -36,7 +37,7 @@
 static void        dbus_qcondvar_wait         (DBusCondVar *cond,
 					       DBusMutex   *mutex);
 static dbus_bool_t dbus_qcondvar_wait_timeout (DBusCondVar *cond,
-					       DBusMutex   *mutex.
+					       DBusMutex   *mutex,
 					       int          timeout_msec);
 static void        dbus_qcondvar_wake_one     (DBusCondVar *cond);
 static void        dbus_qcondvar_wake_all     (DBusCondVar *cond);
@@ -44,10 +45,10 @@
 
 static const DBusThreadFunctions functions =
 {
-  DBUS_THREAD_FUNCTIONS_NEW_MASK |
-  DBUS_THREAD_FUNCTIONS_FREE_MASK |
-  DBUS_THREAD_FUNCTIONS_LOCK_MASK |
-  DBUS_THREAD_FUNCTIONS_UNLOCK_MASK |
+  DBUS_THREAD_FUNCTIONS_MUTEX_NEW_MASK |
+  DBUS_THREAD_FUNCTIONS_MUTEX_FREE_MASK |
+  DBUS_THREAD_FUNCTIONS_MUTEX_LOCK_MASK |
+  DBUS_THREAD_FUNCTIONS_MUTEX_UNLOCK_MASK |
   DBUS_THREAD_FUNCTIONS_CONDVAR_NEW_MASK |
   DBUS_THREAD_FUNCTIONS_CONDVAR_FREE_MASK |
   DBUS_THREAD_FUNCTIONS_CONDVAR_WAIT_MASK |
@@ -57,7 +58,7 @@
   dbus_qmutex_new,
   dbus_qmutex_free,
   dbus_qmutex_lock,
-  dbus_qmutex_unlock
+  dbus_qmutex_unlock,
   dbus_qcondvar_new,
   dbus_qcondvar_free,
   dbus_qcondvar_wait,
@@ -71,20 +72,20 @@
 {
   QMutex *mutex;
   mutex = new QMutex;
-  return static_cast<DBusMutex*>( mutex );
+  return reinterpret_cast<DBusMutex*>( mutex );
 }
 
 static void
 dbus_qmutex_free (DBusMutex *mutex)
 {
-  QMutex * qmutex = static_cast<QMutex*>(mutex);
-  delete mutex;
+  QMutex * qmutex = reinterpret_cast<QMutex*>(mutex);
+  delete qmutex;
 }
 
 static dbus_bool_t
 dbus_qmutex_lock   (DBusMutex *mutex)
 {
-  QMutex *qmutex = static_cast<QMutex*>(mutex);
+  QMutex *qmutex = reinterpret_cast<QMutex*>(mutex);
   qmutex->lock();
   return TRUE;
 }
@@ -92,7 +93,7 @@
 static dbus_bool_t
 dbus_qmutex_unlock (DBusMutex *mutex)
 {
-  QMutex *qmutex = static_cast<QMutex*>(mutex);
+  QMutex *qmutex = reinterpret_cast<QMutex*>(mutex);
   qmutex->unlock();
   return TRUE;
 }
@@ -102,13 +103,13 @@
 {
   QWaitCondition *cond;
   cond = new QWaitCondition;
-  return static_cast<DBusCondVar*>( cond );
+  return reinterpret_cast<DBusCondVar*>( cond );
 }
 
 static void
 dbus_qcondvar_free (DBusCondVar *cond)
 {
-  QWaitCondition *qcond = static_cast<QWaitCondition*>(cond);
+  QWaitCondition *qcond = reinterpret_cast<QWaitCondition*>(cond);
   delete qcond;
 }
 
@@ -116,37 +117,37 @@
 dbus_qcondvar_wait (DBusCondVar *cond,
 		    DBusMutex   *mutex)
 {
-  QWaitCondition *qcond = static_cast<QWaitCondition*>(cond);
-  QMutex *qmutex = static_cast<QMutex*>(mutex);
+  QWaitCondition *qcond = reinterpret_cast<QWaitCondition*>(cond);
+  QMutex *qmutex = reinterpret_cast<QMutex*>(mutex);
 
   qcond->wait (qmutex);
 }
 
 static dbus_bool_t
-dbus_gcondvar_wait_timeout (DBusCondVar *cond,
+dbus_qcondvar_wait_timeout (DBusCondVar *cond,
 			    DBusMutex   *mutex,
 			    int         timeout_msec)
 {
-  QWaitCondition *qcond = static_cast<QWaitCondition*>(cond);
-  QMutex *qmutex = static_cast<QMutex*>(mutex);
+  QWaitCondition *qcond = reinterpret_cast<QWaitCondition*>(cond);
+  QMutex *qmutex = reinterpret_cast<QMutex*>(mutex);
 
-  return qcond->wait (qmutex, timout_msec);
+  return qcond->wait (qmutex, timeout_msec);
 }
 
 static void
 dbus_qcondvar_wake_one (DBusCondVar *cond)
 {
-  QWaitCondition *qcond = static_cast<QWaitCondition*>(cond);
+  QWaitCondition *qcond = reinterpret_cast<QWaitCondition*>(cond);
 
-  qcond->wakeOne (qmutex);
+  qcond->wakeOne ();
 }
 
 static void
 dbus_qcondvar_wake_all (DBusCondVar *cond)
 {
-  QWaitCondition *qcond = static_cast<QWaitCondition*>(cond);
+  QWaitCondition *qcond = reinterpret_cast<QWaitCondition*>(cond);
 
-  qcond->wakeAll (qmutex);
+  qcond->wakeAll ();
 }
 
 extern "C" {