* qt/qdbusintegrator.cpp: Work around g++ 3.3 bug.

          Patch by Stefan Eilers. (r529537)

diff --git a/ChangeLog b/ChangeLog
index b0fb670a115a60e9e79f91ff17546fcf73bd9916..84488b1e0fed6be69dd31f171e10584f1a426bf0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
-2006-04-13  Thiago Macieira  <thiago.macieira@trolltech.com
+2006-04-13  Thiago Macieira  <thiago.macieira@trolltech.com>
+
+       * qt/qdbusintegrator.cpp: Work around g++ 3.3 bug.
+         Patch by Stefan Eilers. (r529537)
+
+2006-04-13  Thiago Macieira  <thiago.macieira@trolltech.com>
 
        * qt/qdbusinternalfilters.cpp: Don't show the parent's
          contents (r528208)
 
-2006-04-10  Thiago Macieira  <thiago.macieira@trolltech.com
+2006-04-10  Thiago Macieira  <thiago.macieira@trolltech.com>
 
        * qt/Makefile.am: fix the dependency for
           qdbusconnection_p.moc. It's included in qdbusintegrator.cpp,

diff --git a/qt/qdbusintegrator.cpp b/qt/qdbusintegrator.cpp
index a9467c00df3b99e8916a20a15878b8b9a36ea5f3..4a72d197a185b8fcdf4aed4b798a02c92571c52f 100644 (file)
--- a/qt/qdbusintegrator.cpp
+++ b/qt/qdbusintegrator.cpp
@@ -1221,12 +1221,12 @@ void QDBusConnectionPrivate::setConnection(DBusConnection *dbc)
     //qDebug("base service: %s", service);
 }
 
-extern "C"
+extern "C"{
 static void qDBusResultReceived(DBusPendingCall *pending, void *user_data)
 {
     QDBusConnectionPrivate::messageResultReceived(pending, user_data);
 }
-
+}
 void QDBusConnectionPrivate::messageResultReceived(DBusPendingCall *pending, void *user_data)
 {
     QDBusPendingCall *call = reinterpret_cast<QDBusPendingCall *>(user_data);