[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [akonadi/batch-notifications] libs: Fix NotificationMessageV2 DBus marshaller
From:       Dan_Vrátil <dvratil () redhat ! com>
Date:       2013-03-11 13:36:19
Message-ID: 20130311133619.7BC90A604F () git ! kde ! org
[Download RAW message or body]

Git commit 117c5555b7d59bdf68e0e611e8e59d20130f298b by Dan Vr=C3=A1til.
Committed on 11/03/2013 at 14:21.
Pushed by dvratil into branch 'batch-notifications'.

Fix NotificationMessageV2 DBus marshaller

M  +2    -0    libs/notificationmessagev2.cpp
M  +1    -1    libs/notificationmessagev2_p.h

http://commits.kde.org/akonadi/117c5555b7d59bdf68e0e611e8e59d20130f298b

diff --git a/libs/notificationmessagev2.cpp b/libs/notificationmessagev2.cpp
index c9dc535..aca555e 100644
--- a/libs/notificationmessagev2.cpp
+++ b/libs/notificationmessagev2.cpp
@@ -395,6 +395,8 @@ const QDBusArgument& operator>>( const QDBusArgument &a=
rg, Akonadi::Notification
   msg.setEntities( items );
   arg >> ba;
   msg.setResource( ba );
+  arg >> ba;
+  msg.setDestinationResource( ba );
   arg >> id;
   msg.setParentCollection( id );
   arg >> id;
diff --git a/libs/notificationmessagev2_p.h b/libs/notificationmessagev2_p.h
index 065781e..f14a2ad 100644
--- a/libs/notificationmessagev2_p.h
+++ b/libs/notificationmessagev2_p.h
@@ -31,10 +31,10 @@
 #include <QtCore/QSharedDataPointer>
 #include <QtCore/QVariant>
 #include <QtDBus/QDBusArgument>
+#include "notificationmessage_p.h"
 =

 namespace Akonadi
 {
-  class NotificationMessage;
 =

 /**
   @internal
[prev in list] [next in list] [prev in thread] [next in thread]