[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeutils/kwallet
From:       George Staikos <staikos () kde ! org>
Date:       2004-11-11 17:21:52
Message-ID: 20041111172152.5DB5816E35 () office ! kde ! org
[Download RAW message or body]

CVS commit by staikos: 

let's be safer until I finish conflict resolution code: skip entries we already
have.


  M +9 -4      kwalleteditor.cpp   1.49


--- kdeutils/kwallet/kwalleteditor.cpp  #1.48:1.49
@@ -738,9 +738,14 @@ void KWalletEditor::importXML() {
                         e = enode.toElement();
                         QString type = e.tagName().lower();
+                        QString ename = e.attribute("name");
+                        if (_w->hasEntry(ename)) {
                         // FIXME: do conflict resolution
+                                enode = enode.nextSibling();
+                                continue;
+                        }
                         if (type == "password") {
-                                _w->writePassword(e.attribute("name"), e.text());
+                                _w->writePassword(ename, e.text());
                         } else if (type == "stream") {
-                                _w->writeEntry(e.attribute("name"), \
KCodecs::base64Decode(e.text().latin1())); +                                \
_w->writeEntry(ename, KCodecs::base64Decode(e.text().latin1()));  } else if (type == \
"map") {  QMap<QString,QString> map;
@@ -753,5 +758,5 @@ void KWalletEditor::importXML() {
                                         mapNode = mapNode.nextSibling();
                                 }
-                                _w->writeMap(e.attribute("name"), map);
+                                _w->writeMap(ename, map);
                         }
                         enode = enode.nextSibling();


[prev in list] [next in list] [prev in thread] [next in thread]