SessionState needs to be a registered meta type

This is because the mono client sends the session state through
a queued signal connection.

diff --git a/src/common/protocol.h b/src/common/protocol.h
index 89ef407..80b00de 100644 (file)
--- a/src/common/protocol.h
+++ b/src/common/protocol.h
@@ -141,6 +141,7 @@ struct LoginSuccess : public HandshakeMessage
 // TODO: more generic format
 struct SessionState : public HandshakeMessage
 {
 // TODO: more generic format
 struct SessionState : public HandshakeMessage
 {

+    inline SessionState() {} // needed for QMetaType (for the mono client)

     inline SessionState(const QVariantList &identities, const QVariantList &bufferInfos, const QVariantList &networkIds)
     : identities(identities), bufferInfos(bufferInfos), networkIds(networkIds) {}
 
     inline SessionState(const QVariantList &identities, const QVariantList &bufferInfos, const QVariantList &networkIds)
     : identities(identities), bufferInfos(bufferInfos), networkIds(networkIds) {}
 


@@ -149,7 +150,6 @@ struct SessionState : public HandshakeMessage
     QVariantList networkIds;
 };
 
     QVariantList networkIds;
 };
 

-

 /*** handled by SignalProxy ***/
 
 struct SignalProxyMessage
 /*** handled by SignalProxy ***/
 
 struct SignalProxyMessage

diff --git a/src/common/quassel.cpp b/src/common/quassel.cpp
index e081775..66aae90 100644 (file)
--- a/src/common/quassel.cpp
+++ b/src/common/quassel.cpp
@@ -29,18 +29,19 @@
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QFileInfo>
 #include <QCoreApplication>
 #include <QDateTime>
 #include <QFileInfo>

+#include <QHostAddress>

 #include <QLibraryInfo>
 #include <QSettings>
 #include <QTranslator>
 #include <QLibraryInfo>
 #include <QSettings>
 #include <QTranslator>

-#include <QHostAddress>

 
 

-#include "message.h"
+#include "bufferinfo.h"

 #include "identity.h"
 #include "identity.h"

+#include "logger.h"
+#include "message.h"

 #include "network.h"
 #include "network.h"

-#include "bufferinfo.h"
-#include "types.h"
+#include "protocol.h"

 #include "syncableobject.h"
 #include "syncableobject.h"

-#include "logger.h"
+#include "types.h"

 
 Quassel::BuildInfo Quassel::_buildInfo;
 AbstractCliParser *Quassel::_cliParser = 0;
 
 Quassel::BuildInfo Quassel::_buildInfo;
 AbstractCliParser *Quassel::_cliParser = 0;


@@ -194,6 +195,8 @@ void Quassel::registerMetaTypes()
     qRegisterMetaTypeStreamOperators<AccountId>("AccountId");
     qRegisterMetaTypeStreamOperators<MsgId>("MsgId");
 
     qRegisterMetaTypeStreamOperators<AccountId>("AccountId");
     qRegisterMetaTypeStreamOperators<MsgId>("MsgId");
 

+    qRegisterMetaType<Protocol::SessionState>("Protocol::SessionState");
+

     // Versions of Qt prior to 4.7 didn't define QVariant as a meta type
     if (!QMetaType::type("QVariant")) {
         qRegisterMetaType<QVariant>("QVariant");
     // Versions of Qt prior to 4.7 didn't define QVariant as a meta type
     if (!QMetaType::type("QVariant")) {
         qRegisterMetaType<QVariant>("QVariant");