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

List:       kde-commits
Subject:    kdeutils/kwallet
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2004-12-24 17:20:26
Message-ID: 20041224172026.4352D1C08E () office ! kde ! org
[Download RAW message or body]

CVS commit by aacid: 

deprecatedCalls -= 2
Prevent crash when importing/merging wallets
Aproved by George Staikos


  M +9 -6      kwalleteditor.cpp   1.56


--- kdeutils/kwallet/kwalleteditor.cpp  #1.55:1.56
@@ -421,8 +421,11 @@ void KWalletEditor::updateDetails() {
                         "</qt>");
 
+        if (_folderView->currentItem())
         _details->setText(page
                         .arg(i18n("Folder:"))
                         .arg(_folderView->currentItem()->text())
                         .arg(i18n("Contains one item.", "Contains %n items." \
,_entries.count()))); +        else
+                _details->setText(QString::null);
 }
 
@@ -691,5 +694,5 @@ void KWalletEditor::importWallet() {
 
         QString tmpFile;
-        if (!KIO::NetAccess::download(url, tmpFile)) {
+        if (!KIO::NetAccess::download(url, tmpFile, this)) {
                 KMessageBox::sorry(this, i18n("Unable to access wallet \
'<b>%1</b>'.").arg(url.prettyURL()));  return;
@@ -820,5 +823,5 @@ void KWalletEditor::importXML() {
 
         QString tmpFile;
-        if (!KIO::NetAccess::download(url, tmpFile)) {
+        if (!KIO::NetAccess::download(url, tmpFile, this)) {
                 KMessageBox::sorry(this, i18n("Unable to access XML file \
'<b>%1</b>'.").arg(url.prettyURL()));  return;


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