From: Marcus Eggenberger <egs@quassel-irc.org>
Date: Fri, 28 Aug 2009 15:55:40 +0000 (+0200)
Subject: Fixing issues with renaming synced objects. And fixing issue with nickchanges of... 
X-Git-Tag: 0.5-rc2~88
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=5432a429749c8cfa295d0f26e30e7e590873f51c

Fixing issues with renaming synced objects. And fixing issue with nickchanges of own nick.
Core update is recommended.
---

diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp
index 181f1109..f1ec7d69 100644
--- a/src/common/ircuser.cpp
+++ b/src/common/ircuser.cpp
@@ -124,8 +124,8 @@ void IrcUser::setRealName(const QString &realName) {
 void IrcUser::setAway(const bool &away) {
   if(away != _away) {
     _away = away;
-    emit awaySet(away);
     SYNC(ARG(away))
+    emit awaySet(away);
   }
 }
 
@@ -181,10 +181,11 @@ void IrcUser::setHost(const QString &host) {
 
 void IrcUser::setNick(const QString &nick) {
   if(!nick.isEmpty() && nick != _nick) {
+    qDebug() << "setNick" << this << _nick << nick;
     _nick = nick;
     updateObjectName();
-    emit nickSet(nick);
     SYNC(ARG(nick))
+    emit nickSet(nick);
   }
 }
 
diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 756e63c3..82b428ac 100644
--- a/src/common/signalproxy.cpp
+++ b/src/common/signalproxy.cpp
@@ -415,9 +415,6 @@ void SignalProxy::renameObject(const SyncableObject *obj, const QString &newname
 }
 
 void SignalProxy::objectRenamed(const QByteArray &classname, const QString &newname, const QString &oldname) {
-  if(proxyMode() == Server)
-    return;
-
   if(_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname) && oldname != newname) {
     SyncableObject *obj = _syncSlave[classname][newname] = _syncSlave[classname].take(oldname);
     requestInit(obj);