patch by Jérôme Lodewyck <lodewyck@clipper.ens.fr> to enable integration

of an existing connection into the Qt main loop

diff --git a/qt/connection.cpp b/qt/connection.cpp
index ba16150..f426d69 100644 (file)
--- a/qt/connection.cpp
+++ b/qt/connection.cpp
@@ -156,6 +156,13 @@ void* Connection::virtual_hook( int, void*  )
 {
 }
 
+void Connection::dbus_connection_setup_with_qt_main (DBusConnection *connection)
+{
+  d->setConnection( connection );
+}
+
+
+
 /////////////////////////////////////////////////////////
 
 #include "connection.moc"

diff --git a/qt/connection.h b/qt/connection.h
index ca962b1..7cb922e 100644 (file)
--- a/qt/connection.h
+++ b/qt/connection.h
@@ -50,6 +50,7 @@ namespace DBusQt {
     Message borrowMessage();
     Message popMessage();
     void stealBorrowMessage( const Message& );
+    void dbus_connection_setup_with_qt_main (DBusConnection *connection);
 
   public slots:
     void open( const QString& );

diff --git a/qt/integrator.cpp b/qt/integrator.cpp
index 5cf7264..fff32b3 100644 (file)
--- a/qt/integrator.cpp
+++ b/qt/integrator.cpp
@@ -162,13 +162,18 @@ Integrator::Integrator( DBusServer *server, QObject *parent )
 
 void Integrator::slotRead( int fd )
 {
-  Q_UNUSED( fd );
+  QIntDictIterator<Watch>      it( m_watches );
+  for ( ; it.current(); ++it )
+    dbus_watch_handle ( it.current()->watch, DBUS_WATCH_READABLE );
+
   emit readReady();
 }
 
 void Integrator::slotWrite( int fd )
 {
-  Q_UNUSED( fd );
+  QIntDictIterator<Watch>       it( m_watches );
+  for ( ; it.current(); ++it )
+    dbus_watch_handle ( it.current()->watch, DBUS_WATCH_WRITABLE );
 }
 
 void Integrator::slotTimeout( DBusTimeout *timeout )