aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator
diff options
context:
space:
mode:
authorIngo Bauersachs <ingo@jitsi.org>2015-10-04 18:33:58 +0200
committerIngo Bauersachs <ingo@jitsi.org>2015-10-04 18:40:58 +0200
commit7741cbabaced38700ada035e304a36e9551e8c29 (patch)
tree1d5247120682f9e69ba8d64f4a16c20570e1f4da /src/net/java/sip/communicator
parent8f98a17d91c4fed3a3e3984c8e8955ccfada6e85 (diff)
downloadjitsi-7741cbabaced38700ada035e304a36e9551e8c29.zip
jitsi-7741cbabaced38700ada035e304a36e9551e8c29.tar.gz
jitsi-7741cbabaced38700ada035e304a36e9551e8c29.tar.bz2
Move SDES default ciphers from settings to default config
Diffstat (limited to 'src/net/java/sip/communicator')
-rw-r--r--src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java b/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java
index 483f220..e81f4da 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java
+++ b/src/net/java/sip/communicator/plugin/desktoputil/wizard/SecurityPanel.java
@@ -113,8 +113,10 @@ public class SecurityPanel
private static final long serialVersionUID = 0L;
private List<Entry> data = new ArrayList<Entry>();
- private final String defaultCiphers = UtilActivator.getResources()
- .getSettingsString(SDesControl.SDES_CIPHER_SUITES);
+
+ private final String defaultCiphers =
+ UtilActivator.getConfigurationService()
+ .getString(SDesControl.SDES_CIPHER_SUITES);
CipherTableModel(String ciphers)
{