signalproxy no longer requests init data for pre-synced objects (internal stuff only)

[quassel.git] / src / common / signalproxy.cpp

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 612f214..76fccb7 100644 (file)
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -606,23 +606,27 @@ void SignalProxy::synchronize(SyncableObject *obj) {
 
   if(proxyMode() == Server) {
     connect(obj, SIGNAL(objectRenamed(QString, QString)), this, SLOT(objectRenamed(QString, QString)));
-    setInitialized(obj);
+    obj->setInitialized();
+    emit objectInitialized(obj);
   } else {
-    requestInit(obj);
+    if(obj->isInitialized())
+      emit objectInitialized(obj);
+    else
+      requestInit(obj);
   }
 }
 
-void SignalProxy::setInitialized(SyncableObject *obj) {
-  obj->setInitialized();
-  emit objectInitialized(obj);
-}
+// void SignalProxy::setInitialized(SyncableObject *obj) {
+//   obj->setInitialized();
+//   emit objectInitialized(obj);
+// }
 
-bool SignalProxy::isInitialized(SyncableObject *obj) const {
-  return obj->isInitialized();
-}
+// bool SignalProxy::isInitialized(SyncableObject *obj) const {
+//   return obj->isInitialized();
+// }
 
 void SignalProxy::requestInit(SyncableObject *obj) {
-  if(proxyMode() == Server || isInitialized(obj))
+  if(proxyMode() == Server || obj->isInitialized())
     return;
 
   QVariantList params;
@@ -923,14 +927,11 @@ void SignalProxy::writeDataToDevice(QIODevice *dev, const QVariant &item, bool c
     itemStream.setVersion(QDataStream::Qt_4_2);
     itemStream << item;
 
-    int rawSize = rawItem.size();
     rawItem = qCompress(rawItem);
 
     out << rawItem;
-    qDebug() << "Sending compressed" << rawItem.size() << "Bytes. (was:" << rawSize << "Bytes)" << dev;
   } else {
     out << item;
-    qDebug() << "Sending uncompressed" << block.size() - sizeof(quint32);
   }
 
   out.device()->seek(0);
@@ -954,15 +955,12 @@ bool SignalProxy::readDataFromDevice(QIODevice *dev, quint32 &blockSize, QVarian
   if(compressed) {
     QByteArray rawItem;
     in >> rawItem;
-    int rawSize = rawItem.size();
     rawItem = qUncompress(rawItem);
-    qDebug() << "receiving compressed" << rawSize << "Bytes. (uncompressed:" << rawItem.size() << "Bytes)" << dev;
       
     QDataStream itemStream(&rawItem, QIODevice::ReadOnly);
     itemStream.setVersion(QDataStream::Qt_4_2);
     itemStream >> item;
   } else {
-    qDebug() << "receiving uncompressed" << blockSize << "Bytes" << dev;
     in >> item;
   }
 
@@ -1018,10 +1016,11 @@ QVariantMap SignalProxy::initData(SyncableObject *obj) const {
 }
 
 void SignalProxy::setInitData(SyncableObject *obj, const QVariantMap &properties) {
-  if(isInitialized(obj))
+  if(obj->isInitialized())
     return;
   obj->fromVariantMap(properties);
-  setInitialized(obj);
+  obj->setInitialized();
+  emit objectInitialized(obj);
   invokeSlot(obj, updatedRemotelyId(obj));
 }