--- a/keyring/src/org/netbeans/modules/keyring/kde/KWalletProvider.java Tue Feb 02 20:09:38 2010 +0100 +++ a/keyring/src/org/netbeans/modules/keyring/kde/KWalletProvider.java Tue Feb 02 23:53:57 2010 +0100 @@ -77,7 +77,7 @@ public char[] read(String key){ runCommand("close", runCommand("localWallet"), "true".toCharArray() ); if (updateHandler()){ - char[] runCommand = runCommand("readPassword", handler, getApplicationName(), key.toCharArray(), getApplicationNameWithVersion()); + char[] runCommand = runCommand("readPassword", handler, getApplicationName(), key.toCharArray(), getApplicationName(true)); runCommand("close", runCommand("localWallet"), "true".toCharArray() ); return runCommand; } @@ -91,7 +91,7 @@ runCommand("close", runCommand("localWallet"), "true".toCharArray() ); if (updateHandler()){ if (new String(runCommand("writePassword", handler , getApplicationName() - , key.toCharArray(), password , getApplicationNameWithVersion()) + , key.toCharArray(), password , getApplicationName(true)) ).equals("-1")){ throw new KwalletException("save"); } @@ -106,7 +106,7 @@ runCommand("close", runCommand("localWallet"), "true".toCharArray() ); if (updateHandler()){ if (new String(runCommand("removeEntry" ,handler, - getApplicationName() , key.toCharArray() , getApplicationNameWithVersion() + getApplicationName() , key.toCharArray() , getApplicationName(true) )).equals("-1")){ throw new KwalletException("delete"); } @@ -122,7 +122,7 @@ return true; } char[] localWallet = runCommand("localWallet"); - handler = runCommand("open", localWallet , "0".toCharArray() , getApplicationNameWithVersion()); + handler = runCommand("open", localWallet , "0".toCharArray() , getApplicationName(true)); if(!(new String(handler)).equals("-1")){ return true; } @@ -186,19 +186,19 @@ } private char[] getApplicationName(){ + return getApplicationName(false); + } + + private char[] getApplicationName(boolean version){ String appName; try { - appName = MessageFormat.format(NbBundle.getBundle("org.netbeans.core.windows.view.ui.Bundle").getString("CTL_MainWindow_Title_No_Project"),"…"); + appName = MessageFormat.format(NbBundle.getBundle("org.netbeans.core.windows.view.ui.Bundle").getString("CTL_MainWindow_Title_No_Project"),version ? System.getProperty("netbeans.buildnumber"):""); } catch (MissingResourceException x) { - appName = "NetBeans"; + appName = "NetBeans"+(version? " "+System.getProperty("netbeans.buildnumber"):""); } return appName.toCharArray(); } - private char[] getApplicationNameWithVersion(){ - return (new String(getApplicationName())+" "+System.getProperty("netbeans.buildnumber")).toCharArray(); - } - public class KwalletException extends RuntimeException{ public KwalletException(String desc) {