From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Fri, 4 Jan 2008 00:51:53 +0000 (+0000)
Subject: - Fixed a minor bug in IrcUser
X-Git-Tag: 0.2.0-alpha1~256
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=dcc90a564e00e206f05db224f1654c8907f149f4;hp=da2eb70e632526088ef0e31cfd52beb563ce31ce

- Fixed a minor bug in IrcUser
- Made the SignalProxy::objectRenamed slot behave more like the objectDestroyed slot
---

diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp
index 91b3a2b2..affd64b7 100644
--- a/src/common/ircuser.cpp
+++ b/src/common/ircuser.cpp
@@ -136,7 +136,6 @@ void IrcUser::setHost(const QString &host) {
 
 void IrcUser::setNick(const QString &nick) {
   if(!nick.isEmpty() && nick != _nick) {
-    QString oldnick(_nick);
     _nick = nick;
     updateObjectName();
     emit nickSet(nick);
@@ -144,14 +143,14 @@ void IrcUser::setNick(const QString &nick) {
 }
 
 void IrcUser::updateObjectName() {
-  QString oldName(objectName());
-  setObjectName(QString::number(networkInfo->networkId()) + "/" + _nick);
-  if(!oldName.isEmpty()) {
-    emit renameObject(oldName, objectName());
+  QString newName = QString::number(networkInfo->networkId()) + "/" + _nick;
+  QString oldName = objectName();
+  if(oldName != newName) {
+    setObjectName(newName);
+    emit renameObject(oldName, newName);
   }
 }
 
-
 void IrcUser::updateHostmask(const QString &mask) {
   if(mask == hostmask())
     return;
@@ -165,9 +164,9 @@ void IrcUser::updateHostmask(const QString &mask) {
 void IrcUser::joinChannel(IrcChannel *channel) {
   Q_ASSERT(channel);
   if(!_channels.contains(channel)) {
+    _channels.insert(channel);
     channel->join(this);
     connect(channel, SIGNAL(destroyed()), this, SLOT(channelDestroyed()));
-    _channels.insert(channel);
     emit channelJoined(channel->name());
   }
 }
diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index a6e16faa..7aab0252 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -247,7 +247,8 @@ void SignalProxy::objectRenamed(QString oldname, QString newname) {
 }
 
 void SignalProxy::objectRenamed(QByteArray classname, QString oldname, QString newname) {
-  if(_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname))
+  QMutexLocker locker(&slaveMutex);
+  if(_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname) && oldname != newname)
     _syncSlave[classname][newname] = _syncSlave[classname].take(oldname);
 }
 
@@ -433,7 +434,7 @@ void SignalProxy::synchronizeAsMaster(QObject *sender) {
   relay->setSynchronize(true);
 
   if(sender->metaObject()->indexOfSignal(QMetaObject::normalizedSignature("renameObject(QString, QString)")) != -1)
-    connect(sender, SIGNAL(renameObject(QString, QString)), this, SLOT(objectRenamed(QString, QString)));
+    connect(sender, SIGNAL(renameObject(QString, QString)), this, SLOT(objectRenamed(QString, QString)), Qt::DirectConnection);
 
   QByteArray className(sender->metaObject()->className());
   _syncSlave[className][sender->objectName()] = sender;
@@ -556,14 +557,14 @@ void SignalProxy::dispatchSignal(const QVariant &identifier, const QVariantList
 void SignalProxy::receivePeerSignal(QIODevice *sender, const QVariant &packedFunc) {
   QVariantList params(packedFunc.toList());
 
+  QVariant call = params.takeFirst();
+  if(call.type() != QVariant::Int)
+    return handleSignal(call.toByteArray(), params);
+
   // well yes we are locking code here and not only data.
   // otherwise each handler would have to lock the data anyway. this leaves us on the safe side
   // unable to forget a lock
   QMutexLocker locker(&slaveMutex);
-  
-  QVariant call = params.takeFirst();
-  if(call.type() != QVariant::Int)
-    return handleSignal(call.toByteArray(), params);
 
   switch(call.toInt()) {
   case Sync:
@@ -605,7 +606,8 @@ void SignalProxy::handleSync(QVariantList params) {
     qWarning() << "received Sync Call for Object" << receiver
 	       << "- no matching Slot for Signal:" << signalName;
     return;
-   }
+  }
+
   int slotId = syncMap(receiver)[signalId];
   if(!invokeSlot(receiver, slotId, params))
     qWarning("SignalProxy::handleSync(): invokeMethod for \"%s\" failed ", methodName(receiver, slotId).constData());