[patch] Patch

kdbus-patch2 (text/plain), 3.27 KB, created by Michael Scondo on 2008-10-27 11:45:03 UTC

diff -ru kdbus-0.8.6/src/dbusdispatcher.cpp kdbus-0.8.6.orig/src/dbusdispatcher.cpp
--- kdbus-0.8.6/src/dbusdispatcher.cpp	2008-09-08 15:24:38.000000000 +0200
+++ kdbus-0.8.6.orig/src/dbusdispatcher.cpp	2006-02-18 06:21:43.000000000 +0100
@@ -88,9 +88,9 @@
             params.append( text );
         else if ( type == "BOOLEAN" ) {
             if ( text.lower() == "true" )
-                params.append( QVariant(true, 0) );
+                params.append( true );
             else if ( text.lower() == "false" )
-                params.append( QVariant(false, 0) );
+                params.append( false );
             else
                 ok = false;
         }
diff -ru kdbus-0.8.6/src/dbusmethod.cpp kdbus-0.8.6.orig/src/dbusmethod.cpp
--- kdbus-0.8.6/src/dbusmethod.cpp	2008-09-08 15:24:49.000000000 +0200
+++ kdbus-0.8.6.orig/src/dbusmethod.cpp	2006-02-18 06:21:34.000000000 +0100
@@ -55,8 +55,6 @@
 QPtrList< DBusMethodArgument > DBusMethod::inArgs() const {
 
     QPtrList< DBusMethodArgument > inArgs = m_args;
-    // be sure we have the first element in the list
-    inArgs.first(); 
     while ( 0 != inArgs.current() ) {
         if ( inArgs.current()->direction() != "in" )
             inArgs.take();
@@ -69,8 +67,6 @@
 QPtrList< DBusMethodArgument > DBusMethod::outArgs() const {
 
     QPtrList< DBusMethodArgument > outArgs = m_args;
-    // be sure we have the first element in the list
-    outArgs.first(); 
     while ( 0 != outArgs.current() ) {
         if ( outArgs.current()->direction() != "out" )
             outArgs.take();
diff -ru kdbus-0.8.6/src/dbusobject.cpp kdbus-0.8.6.orig/src/dbusobject.cpp
--- kdbus-0.8.6/src/dbusobject.cpp	2008-09-08 15:25:00.000000000 +0200
+++ kdbus-0.8.6.orig/src/dbusobject.cpp	2006-02-18 06:23:48.000000000 +0100
@@ -42,7 +42,6 @@
 
     QString discoverPath( QDomElement const & elem );
 
-    QDomDocument doc;
     QDBusProxy * proxy;
     DBusObject * p;
 };
@@ -89,19 +88,19 @@
 
     // Now iterate through self, enumerating interfaces, properties, and
     // other objects.
-    QDomElement childElement = myElem.firstChild().toElement();
+    myElem = myElem.firstChild().toElement();
 
     try {
         do {
-            if ( childElement.tagName() == "node" )
-                new DBusObject( this, childElement, d->proxy );
-            else if ( childElement.tagName() == "interface" )
-                new DBusInterface( this, childElement );
+            if ( myElem.tagName() == "node" )
+                new DBusObject( this, myElem, d->proxy );
+            else if ( myElem.tagName() == "interface" )
+                new DBusInterface( this, myElem );
             else
                 kdWarning() << "Unhandled node in introspect data: "
-                            << childElement.tagName() << endl;
-            childElement = childElement.nextSibling().toElement();
-        } while ( !childElement.isNull() );
+                            << myElem.tagName() << endl;
+            myElem = myElem.nextSibling().toElement();
+        } while ( !myElem.isNull() );
     }
     catch ( std::runtime_error const & e ) {
         m_ok = false;
@@ -129,6 +128,7 @@
             .arg( proxy->lastError().message() )
         );
 
+    QDomDocument doc;
     if ( !doc.setContent( reply[0].toString() ) )
         throw QDBusXmlError(
             i18n(