*** empty log message ***

3 files changed, 58 insertions, 18 deletions

diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index 76a45f4..ab3238a 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -2798,10 +2798,10 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
   int deletedPasswordsLocal = 0;
   int changedLocal = 0;
   int changedRemote = 0;
 
-  PwMSyncItem* syncItemLocal;
-  PwMSyncItem* syncItemRemote;
+  PwMSyncItem syncItemLocal;
+  PwMSyncItem syncItemRemote;
 
   QString mCurrentSyncName = manager->getCurrentSyncName();
   QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
@@ -2827,9 +2827,9 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
       }
     }	
 
   syncItemLocal = syncLocal->getSyncDataEntry(index); 
-  qDebug("Last Sync %s ", syncItemLocal->lastSyncDate.toString().latin1());
+  qDebug("Last Sync %s ", syncItemLocal.lastSyncDate.toString().latin1());
 
   //Step 2. Find syncinfo in remote file and create if not existent.
   found = syncRemote->findSyncData(mCurrentSyncName, &index);
   if (found == false)
@@ -2851,20 +2851,20 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
   //and remove the found entry here. We will reenter it later again.
   syncRemote->delSyncDataEntry(index, true);
 
 
-  if ( syncItemLocal->lastSyncDate == mLastSync ) {
+  if ( syncItemLocal.lastSyncDate == mLastSync ) {
     qDebug("FULLDATE 2");
     fullDateRange = true;
   }
   
   if ( ! fullDateRange  ) {
-        if ( syncItemLocal->lastSyncDate != syncItemRemote->lastSyncDate ) {
+        if ( syncItemLocal.lastSyncDate != syncItemRemote->lastSyncDate ) {
             
             // qDebug("set fulldate to true %s %s" ,addresseeLSync->dtStart().toString().latin1(), addresseeRSync->dtStart().toString().latin1() ); 
             //qDebug("%d %d %d %d ", addresseeLSync->dtStart().time().second(), addresseeLSync->dtStart().time().msec() , addresseeRSync->dtStart().time().second(), addresseeRSync->dtStart().time().msec());
             fullDateRange = true;
-            qDebug("FULLDATE 3 %s %s", syncItemLocal->lastSyncDate.toString().latin1() , syncItemRemote->lastSyncDate.toString().latin1() );
+            qDebug("FULLDATE 3 %s %s", syncItemLocal.lastSyncDate.toString().latin1() , syncItemRemote.lastSyncDate.toString().latin1() );
         } 
     }
     // fullDateRange = true; // debug only!
     if ( fullDateRange )
@@ -2919,11 +2919,14 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
                 }
             } else { //  no conflict
                     if ( inRemote->meta.update > mLastSync || mode == 5 ) {
                         inRemote->meta.update = modifiedSync;
+
+			//first check if we have a matching category in the local file
+			const string* remotecat = syncRemote->getCategory(catRemote);
 			//US                        syncRemote->insertAddressee( inRemote, false );
 			//US                        syncLocal->insertAddressee( inRemote, false );
-			syncLocal->addEntry("newcategory", inRemote, true, false);
+			syncLocal->addEntry(remotecat->c_str(), inRemote, true, false);
 
                         ++addedPasswordsLocal;
                     } else {
                         // pending checkExternSyncAddressee(addresseeRSyncSharp, inR);
@@ -2952,8 +2955,10 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
         uid = el[ incCounter ]; 
 
         inLocal = syncLocal->findEntryByID( uid, &catLocal, &indexLocal );
         inRemote = syncRemote->findEntryByID( uid, &catRemote, &indexRemote );
+	PWM_ASSERT(inLocal);
+
         if ( inRemote == 0 ) { 
                 if ( inLocal->meta.update < mLastSync && mode != 4 ) {
                     // pending checkExternSyncAddressee(addresseeLSyncSharp, inL);
 		    syncLocal->delEntry(catLocal, indexLocal, true);
@@ -2962,12 +2967,19 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
                 } else {
                     if ( ! manager->mWriteBackExistingOnly ) {
                         ++addedPasswordsRemote; 
                         inLocal->meta.update = modifiedSync;
+
+			//first check if we have a matching category in the remote file
+			const string* localcat = syncLocal->getCategory(catLocal);
+
                         //USsyncLocal->insertAddressee( inLocal, false );
-                        (*inRemote) = (*inLocal);
+                        PwMDataItem newEntry;
+			newEntry = *inLocal; 
+			inRemote = &newEntry;
+	
                         //USsyncRemote->insertAddressee( inRemote, false );
-			syncRemote->addEntry("newcategory", inRemote, true, false);
+			syncRemote->addEntry(localcat->c_str(), inRemote, true, false);
 
                     }
                 }
 
@@ -2984,10 +2996,10 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
     QTime t =  mLastSync.time();
     mLastSync.setTime( QTime (t.hour (), t.minute (), t.second () )  );
 
    
-    syncItemLocal->lastSyncDate = mLastSync;
-    syncItemRemote->lastSyncDate = mLastSync;
+    syncItemLocal.lastSyncDate = mLastSync;
+    syncItemRemote.lastSyncDate = mLastSync;
 
     //    addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ;
     //    addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName  );
 
@@ -3281,9 +3293,9 @@ QStringList PwMDoc::getIDEntryList()
     entrBegin = catcounter->d.begin();
     entrEnd = catcounter->d.end();
     entrI = entrBegin;
     while (entrI != entrEnd) {
-      results.append( (*entrI).meta.uniqueid );
+      results.append( (*entrI).meta.uniqueid.c_str() );
       ++entrI;
     }
     ++catcounter;
   }
diff --git a/pwmanager/pwmanager/pwmdoc.h b/pwmanager/pwmanager/pwmdoc.h
index 91277f6..ddab7f3 100644
--- a/pwmanager/pwmanager/pwmdoc.h
+++ b/pwmanager/pwmanager/pwmdoc.h
@@ -115,11 +115,11 @@ struct PwMMetaData
 	  * 0 disables.
 	  */
 	unsigned long updateInt;
  
-  //US ENH: enhancements of the filestructure
-  /* each entry gets a unique id assigned  */
-  QString  uniqueid;
+	//US ENH: enhancements of the filestructure
+	/* each entry gets a unique id assigned  */
+	string  uniqueid;
 
 
 	void clear()
 		{
@@ -128,8 +128,19 @@ struct PwMMetaData
 			update = QDateTime();
 			updateInt = 0;
 			uniqueid = KApplication::randomString(8);
 		}
+
+	PwMMetaData& operator = (const PwMMetaData& x)
+	{
+	  create = x.create;
+	  expire = x.expire;
+	  update = x.update;
+	  updateInt = x.updateInt;
+	  uniqueid = x.uniqueid;
+	  return *this;
+	}
+
 	inline bool isValid() const
 		{
 			if (valid.isNull())
 				return true;
@@ -205,8 +216,25 @@ struct PwMDataItem
 		binary = false;
 		if (clearMeta)
 			meta.clear();
 	}
+  
+	PwMDataItem& operator = (const PwMDataItem& x)
+	{
+	  qDebug("oper=%s", x.desc.c_str());
+	  desc = x.desc;
+	  name = x.name;
+	  pw = x.pw;
+	  comment = x.comment;
+	  url = x.url;
+	  launcher = x.launcher;
+	  lockStat = x.lockStat;
+	  listViewPos = x.listViewPos;
+	  binary = x.binary;
+	  meta = x.meta;
+	  rev = x.rev;
+	  return *this;
+	}
 
 };
 
 struct PwMCategoryItem
@@ -762,10 +790,10 @@ protected:
 	/** add new syncdataentry */
 	PwMerror addSyncDataEntry(PwMSyncItem *d, bool dontFlagDirty = false);
 
 	/** returns a pointer to the syncdata */
-	PwMSyncItem* getSyncDataEntry(unsigned int index)
-			{ return &(dti.syncDta[index]); }
+	PwMSyncItem getSyncDataEntry(unsigned int index)
+			{ return *(dti.syncDta[index]); }
 
 	/** delete entry */
 	bool delSyncDataEntry(unsigned int index, bool dontFlagDirty = false);
 
diff --git a/pwmanager/pwmanager/serializer.cpp b/pwmanager/pwmanager/serializer.cpp
index f615082..74b3354 100644
--- a/pwmanager/pwmanager/serializer.cpp
+++ b/pwmanager/pwmanager/serializer.cpp
@@ -645,9 +645,9 @@ bool Serializer::writeMeta(QDomElement *e,
 	tag.appendChild(text);
 	e->appendChild(tag);
 
 	tag = domDoc->createElement(META_UNIQUEID);
-	text = domDoc->createTextNode(escapeEntryData(dta.uniqueid));
+	text = domDoc->createTextNode(escapeEntryData(dta.uniqueid.c_str()));
 	tag.appendChild(text);
 	e->appendChild(tag);
 
 #undef new_text