Kolab Groupware OBS

_service:set_version:akonadi.spec Changed

_service:recompress:tar_scm:akonadi-1.12.42.git20141212.b6a0519.tar.gz/server/src/handler/tagstore.cpp -> _service:recompress:tar_scm:akonadi-1.12.42.git20150105.5685b60.tar.gz/server/src/handler/tagstore.cpp Changed

@@ -52,6 +52,8 @@
     throw HandlerException( "No such tag" );
   }
 
+  QSet<QByteArray> changes;
+
   // Retrieve all tag's attributes
   const TagAttribute::List attributes = TagAttribute::retrieveFiltered( TagAttribute::tagIdFullColumnName(), tagId );
   QMap<QByteArray,TagAttribute> attributesMap;
@@ -67,6 +69,7 @@
     if ( attr == AKONADI_PARAM_PARENT ) {
       const qint64 parent = m_streamParser->readNumber();
             changedTag.setParentId( parent );
+      changes << AKONADI_PARAM_PARENT;
     } else if ( attr == AKONADI_PARAM_GID ) {
       throw HandlerException( "Changing tag GID is not allowed" );
     } else if ( attr == AKONADI_PARAM_UID ) {
@@ -82,7 +85,10 @@
             }
             type = newType;
         }
-        changedTag.setTagType(type);
+        if (type.id() != changedTag.typeId()) {
+            changedTag.setTagType(type);
+            changes << AKONADI_PARAM_MIMETYPE;
+        }
     } else if ( attr == AKONADI_PARAM_REMOTEID ) {
         const QString &remoteId = m_streamParser->readUtf8String();
         if (!connection()->context()->resource().isValid()) {
@@ -116,6 +122,7 @@
                 // We can't break here, we need to finish reading the command
             }
         }
+        //Do not notify about remoteid changes, otherwise we bounce back and forth between resources recording it's change and updating the remote id.
     } else {
       if ( attr.startsWith( '-' ) ) {
         const QByteArray attrName = attr.mid( 1 );
@@ -140,6 +147,7 @@
             throw HandlerException("Failed to insert attribute");
         }
       }
+      changes << attr;
     }
   }
 
@@ -147,7 +155,9 @@
       if (!changedTag.update()) {
         throw HandlerException( "Failed to store changes" );
       }
-      DataStore::self()->notificationCollector()->tagChanged( changedTag );
+      if (!changes.isEmpty()) {
+        DataStore::self()->notificationCollector()->tagChanged( changedTag );
+      }
 
       ImapSet set;
       set.add( QVector<qint64>() << tagId );

_service:set_version:akonadi.dsc Changed

Changes of Revision 3