summaryrefslogtreecommitdiff
authorar <ar>2005-02-18 20:21:32 (UTC)
committer ar <ar>2005-02-18 20:21:32 (UTC)
commitd8254f2f295b07bdadf6b4b25f0bd125d8121c28 (patch) (unidiff)
treebc3edde3980b5c568e630ef4418e7508e3d5d374
parent03da1c30d7d6c7197a551219e3a36c9a3f469cc8 (diff)
downloadopie-d8254f2f295b07bdadf6b4b25f0bd125d8121c28.zip
opie-d8254f2f295b07bdadf6b4b25f0bd125d8121c28.tar.gz
opie-d8254f2f295b07bdadf6b4b25f0bd125d8121c28.tar.bz2
- #1570 - Confirmation needed before restore backup and overwrite local data
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--noncore/settings/backup/backuprestore.cpp5
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ac976d..218aacf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@
17 * #1554 - Fixed Opie-Console name in .desktop file (mickeyl) 17 * #1554 - Fixed Opie-Console name in .desktop file (mickeyl)
18 * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke) 18 * #1556 - Start to look for sound files in /opt/QtPalmtop/sounds (zecke)
19 * #1558 - Fixed opie-login breaking opie startup (mickeyl) 19 * #1558 - Fixed opie-login breaking opie startup (mickeyl)
20 * #1570 - Confirmation needed befor Restore a backup and overwrite local data (ar)
20 * n.a. - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw) 21 * n.a. - PackageManager - fixed where last package in status file was not shown as installed when it should be (drw)
21 22
22 Internal 23 Internal
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 8928cda..180980a 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -587,6 +587,11 @@ void BackupAndRestore::restore()
587 return; 587 return;
588 } 588 }
589 589
590 if ( QMessageBox::warning( this, tr( "Restore" ),
591 tr( "Would you really overwrite your local data?" ),
592 tr( "Yes" ), tr( "No" ), "", 1 ) == 1 )
593 return;
594
590 OWait *owait = new OWait(); 595 OWait *owait = new OWait();
591 Global::statusMessage( tr( "Restore Backup..." ) ); 596 Global::statusMessage( tr( "Restore Backup..." ) );
592 owait->show(); 597 owait->show();