*** 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
@@ -2800,6 +2800,6 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
   int changedRemote = 0;
 
-  PwMSyncItem* syncItemLocal;
-  PwMSyncItem* syncItemRemote;
+  PwMSyncItem syncItemLocal;
+  PwMSyncItem syncItemRemote;
 
   QString mCurrentSyncName = manager->getCurrentSyncName();
@@ -2829,5 +2829,5 @@ 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.
@@ -2853,5 +2853,5 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
 
 
-  if ( syncItemLocal->lastSyncDate == mLastSync ) {
+  if ( syncItemLocal.lastSyncDate == mLastSync ) {
     qDebug("FULLDATE 2");
     fullDateRange = true;
@@ -2859,10 +2859,10 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
   
   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() );
         } 
     }
@@ -2921,7 +2921,10 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
                     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;
@@ -2954,4 +2957,6 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
         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 ) {
@@ -2964,8 +2969,15 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
                         ++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);
 
                     }
@@ -2986,6 +2998,6 @@ PwMerror PwMDoc::syncronize(KSyncManager* manager, PwMDoc* syncLocal , PwMDoc* s
 
    
-    syncItemLocal->lastSyncDate = mLastSync;
-    syncItemRemote->lastSyncDate = mLastSync;
+    syncItemLocal.lastSyncDate = mLastSync;
+    syncItemRemote.lastSyncDate = mLastSync;
 
     //    addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ;
@@ -3283,5 +3295,5 @@ QStringList PwMDoc::getIDEntryList()
     entrI = entrBegin;
     while (entrI != entrEnd) {
-      results.append( (*entrI).meta.uniqueid );
+      results.append( (*entrI).meta.uniqueid.c_str() );
       ++entrI;
     }
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
@@ -117,7 +117,7 @@ struct PwMMetaData
         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;
 
 
@@ -130,4 +130,15 @@ struct PwMMetaData
                         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
                 {
@@ -207,4 +218,21 @@ struct PwMDataItem
                         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;
+        }
 
 };
@@ -764,6 +792,6 @@ protected:
 
         /** 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 */
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
@@ -647,5 +647,5 @@ bool Serializer::writeMeta(QDomElement *e,
 
         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);