From 3ab235a34442144dd6d3f1fb1672908f4e562dd3 Mon Sep 17 00:00:00 2001 From: Danny van Heumen Date: Sun, 21 Sep 2014 15:52:30 +0200 Subject: [PATCH] Fine-tuning away behaviour: empty message implies no message. --- .../protocol/irc/OperationSetPersistentPresenceIrcImpl.java | 4 +--- .../sip/communicator/impl/protocol/irc/PresenceManager.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/irc/OperationSetPersistentPresenceIrcImpl.java b/src/net/java/sip/communicator/impl/protocol/irc/OperationSetPersistentPresenceIrcImpl.java index 4d5b087f3..a5e377177 100644 --- a/src/net/java/sip/communicator/impl/protocol/irc/OperationSetPersistentPresenceIrcImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/irc/OperationSetPersistentPresenceIrcImpl.java @@ -339,9 +339,7 @@ public void publishPresenceStatus(final PresenceStatus status, if (statusMessage != null && statusMessage.isEmpty()) { // if we provide a message, make sure it isn't empty - statusMessage = - IrcActivator.getResources().getI18NString( - "service.gui.AWAY_STATUS"); + statusMessage = null; } final IrcStack provider = this.parentProvider.getIrcStack(); if (status.getStatus() >= IrcStatusEnum.AVAILABLE_THRESHOLD) diff --git a/src/net/java/sip/communicator/impl/protocol/irc/PresenceManager.java b/src/net/java/sip/communicator/impl/protocol/irc/PresenceManager.java index 027ed3b97..c2b09945d 100644 --- a/src/net/java/sip/communicator/impl/protocol/irc/PresenceManager.java +++ b/src/net/java/sip/communicator/impl/protocol/irc/PresenceManager.java @@ -136,7 +136,7 @@ public void away(final boolean isAway, final String awayMessage) if (isAway && (!this.away || awayMessage != null)) { - // In case we aren't AWAY yet, or in case the message has changed. + // In case we aren't AWAY yet, or if there is a message to set. this.irc.rawMessage("AWAY :" + this.submittedMessage); } else if (isAway != this.away)