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

List:       kde-commits
Subject:    [kwalletmanager] /: Merge branch 'frameworks'
From:       Valentin Rusu <kde () rusu ! info>
Date:       2015-06-13 16:00:30
Message-ID: E1Z3nrC-0004xT-O6 () scm ! kde ! org
[Download RAW message or body]

Git commit 35f20ebe877279751e863dedc2e7eb5a0f1ca13b by Valentin Rusu.
Committed on 13/06/2015 at 15:32.
Pushed by vrusu into branch 'master'.

Merge branch 'frameworks'

The master is now KF5 compatible and ready to be released

M  +2    -2    kwalletmanager5-kwalletd.desktop
M  +3    -2    org.kde.kwalletmanager5.desktop
M  +1    -1    src/konfigurator/kwallet.actions
M  +4    -4    src/konfigurator/kwalletconfig5.desktop
M  +1    -1    src/konfigurator/kwalletmanager5_show.desktop
M  +324  -236  src/manager/kwalletmanager.cpp
M  +30   -35   src/manager/kwalletmanagerwidget.cpp

http://commits.kde.org/kwallet/35f20ebe877279751e863dedc2e7eb5a0f1ca13b

diff --cc src/manager/kwalletmanager.cpp
index 553bef9,64a90dd..a46d934
--- a/src/manager/kwalletmanager.cpp
+++ b/src/manager/kwalletmanager.cpp
@@@ -207,40 -233,29 +233,32 @@@ void KWalletManager::updateWalletDispla
      _managerWidget->updateWalletDisplay();
  }
  
- void KWalletManager::walletCreated(const QString& newWalletName)
+ void KWalletManager::walletCreated(const QString &newWalletName)
  {
      _managerWidget->updateWalletDisplay(newWalletName);
 +    if (!_walletDeleteAction->isEnabled() && (KWallet::Wallet::walletList().size() \
> 0)) {  +        _walletDeleteAction->setEnabled(true);
 +    }
  }
  
- void KWalletManager::walletDeleted(const QString& walletName)
+ void KWalletManager::contextMenu(const QPoint &)
  {
-     Q_UNUSED(walletName);
-     if (_walletDeleteAction->isEnabled() && (KWallet::Wallet::walletList().size() < \
                1)) {
-         _walletDeleteAction->setEnabled(false);
-     }
- }
- 
- 
- void KWalletManager::contextMenu(const QPoint& ) {
  }
  
+ void KWalletManager::closeWallet(const QString &walletName)
+ {
+     int rc = KWallet::Wallet::closeWallet(walletName, false);
+     if (rc != 0) {
+         rc = KMessageBox::warningYesNo(this, i18n("Unable to close wallet cleanly. \
It is probably in use by other applications. Do you wish to force it closed?"), \
QString(), KGuiItem(i18n("Force Closure")), KGuiItem(i18n("Do Not Force"))); +        \
if (rc == KMessageBox::Yes) { +             rc = \
KWallet::Wallet::closeWallet(walletName, true); +             if (rc != 0) {
+                 KMessageBox::sorry(this, i18n("Unable to force the wallet closed. \
Error code was %1.", rc)); +             }
+         }
+     }
  
- void KWalletManager::closeWallet(const QString& walletName) {
- 	int rc = KWallet::Wallet::closeWallet(walletName, false);
- 	if (rc != 0) {
- 		rc = KMessageBox::warningYesNo(this, i18n("Unable to close wallet cleanly. It is \
probably in use by other applications. Do you wish to force it closed?"), QString(), \
                KGuiItem(i18n("Force Closure")), KGuiItem(i18n("Do Not Force")));
- 		if (rc == KMessageBox::Yes) {
- 			rc = KWallet::Wallet::closeWallet(walletName, true);
- 			if (rc != 0) {
- 				KMessageBox::sorry(this, i18n("Unable to force the wallet closed. Error code \
                was %1.", rc));
- 			}
- 		}
- 	}
- 
- 	updateWalletDisplay();
+     updateWalletDisplay();
  }
  
  void KWalletManager::changeWalletPassword(const QString &walletName)


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