diff options
| author | Ingo Bauersachs <ingo@jitsi.org> | 2017-01-14 18:56:13 +0100 |
|---|---|---|
| committer | Ingo Bauersachs <ingo@jitsi.org> | 2017-01-14 18:56:13 +0100 |
| commit | 95f56b342208fd3b2df2796247344d29b4d3abc7 (patch) | |
| tree | e622d29d73ceaa2202ed22e5db87c42599cb63af /src | |
| parent | 4c8ec00a2ae5233bf99c03808e7784c6246b3246 (diff) | |
| download | jitsi-95f56b342208fd3b2df2796247344d29b4d3abc7.zip jitsi-95f56b342208fd3b2df2796247344d29b4d3abc7.tar.gz jitsi-95f56b342208fd3b2df2796247344d29b4d3abc7.tar.bz2 | |
General config: correctly show which key is used to send messages
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/java/sip/communicator/util/ConfigurationUtils.java | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/net/java/sip/communicator/util/ConfigurationUtils.java b/src/net/java/sip/communicator/util/ConfigurationUtils.java index db9fa3b..d24426d 100644 --- a/src/net/java/sip/communicator/util/ConfigurationUtils.java +++ b/src/net/java/sip/communicator/util/ConfigurationUtils.java @@ -438,17 +438,9 @@ public class ConfigurationUtils autoPopupNewMessage = true; // Load the "sendMessageCommand" property. - String messageCommandProperty - = "service.gui.SEND_MESSAGE_COMMAND"; - String messageCommand = configService.getString(messageCommandProperty); - - if(messageCommand == null) - messageCommand - = UtilActivator.getResources() - .getSettingsString(messageCommandProperty); - - if(messageCommand == null || messageCommand.length() == 0) - sendMessageCommand = messageCommand; + String messageCommandProperty = "service.gui.SEND_MESSAGE_COMMAND"; + sendMessageCommand = UtilActivator.getResources() + .getSettingsString(messageCommandProperty); // Load the showCallPanel property. String callPanelShown = configService.getString( |