Fixing issues with renaming synced objects. And fixing issue with nickchanges of...

Core update is recommended.

diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp
index 181f110..f1ec7d6 100644 (file)
--- 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;
 void IrcUser::setAway(const bool &away) {
   if(away != _away) {
     _away = away;

-    emit awaySet(away);

     SYNC(ARG(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) {
 
 void IrcUser::setNick(const QString &nick) {
   if(!nick.isEmpty() && nick != _nick) {

+    qDebug() << "setNick" << this << _nick << nick;

     _nick = nick;
     updateObjectName();
     _nick = nick;
     updateObjectName();

-    emit nickSet(nick);

     SYNC(ARG(nick))
     SYNC(ARG(nick))

+    emit nickSet(nick);

   }
 }
 
   }
 }
 

diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp
index 756e63c..82b428a 100644 (file)
--- 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) {
 }
 
 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);
   if(_syncSlave.contains(classname) && _syncSlave[classname].contains(oldname) && oldname != newname) {
     SyncableObject *obj = _syncSlave[classname][newname] = _syncSlave[classname].take(oldname);
     requestInit(obj);