Attachment 990482 Details for Bug 1191171 – Tentative patch for ksyncdbusenv

[patch] Tentative patch for ksyncdbusenv

plasma-workspace-ksyncdbusenv-gcc5.patch (text/plain), 1.55 KB, created by Lukáš Tinkl on 2015-02-11 16:03:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukáš Tinkl

Created: 2015-02-11 16:03:33 UTC

Size: 1.55 KB

patch

obsolete

>diff --git a/startkde/ksyncdbusenv/ksyncdbusenv.cpp b/startkde/ksyncdbusenv/ksyncdbusenv.cpp
>index 8a01e7d..06e54d2 100644
>--- a/startkde/ksyncdbusenv/ksyncdbusenv.cpp
>+++ b/startkde/ksyncdbusenv/ksyncdbusenv.cpp
>@@ -17,6 +17,8 @@
>  * You should have received a copy of the GNU General Public License
>  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
>  */
>+#include <stdlib.h>
>+
> #include <QCoreApplication>
> #include <QDBusConnection>
> #include <QDBusMessage>
>@@ -31,6 +33,7 @@ Q_DECLARE_METATYPE(EnvMap)
> int main(int argc, char **argv)
> {
>     QCoreApplication app(argc, argv);
>+    qDBusRegisterMetaType<EnvMap>();
> 
>     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
> 
>@@ -43,13 +46,12 @@ int main(int argc, char **argv)
>                                                       QStringLiteral("/org/freedesktop/DBus"),
>                                                       QStringLiteral("org.freedesktop.DBus"),
>                                                       QStringLiteral("UpdateActivationEnvironment"));
>-    qDBusRegisterMetaType<EnvMap>();
>-    msg.setArguments(QList<QVariant>({QVariant::fromValue(envMap)}));
>+    msg << QVariant::fromValue(envMap);
> 
>     QDBusPendingCall reply = QDBusConnection::sessionBus().asyncCall(msg);
>     reply.waitForFinished();
>     if (reply.isError()) {
>-	qDebug() << reply.error().name() << reply.error().message();
>+        qDebug() << reply.error().name() << reply.error().message();
>     }
>-    return reply.isError() ? 1 : 0;
>+    return reply.isError() ? EXIT_FAILURE : EXIT_SUCCESS;
> }

Actions: View | Diff

Attachments on bug 1191171: 990482