diff options
3 files changed, 17 insertions, 4 deletions
diff --git a/src/net/java/sip/communicator/impl/gui/utils/Constants.java b/src/net/java/sip/communicator/impl/gui/utils/Constants.java index 4a36433..804793c 100755 --- a/src/net/java/sip/communicator/impl/gui/utils/Constants.java +++ b/src/net/java/sip/communicator/impl/gui/utils/Constants.java @@ -274,18 +274,23 @@ public class Constants return ImageLoader .getImage(ImageLoader.USER_OFFLINE_ICON); } - else if(connectivity < PresenceStatus.AWAY_THRESHOLD) + else if(connectivity < PresenceStatus.EXTENDED_AWAY_THRESHOLD) { return ImageLoader .getImage(ImageLoader.USER_DND_ICON); } - else if(connectivity == PresenceStatus.AWAY_THRESHOLD) + else if(connectivity == PresenceStatus.EXTENDED_AWAY_THRESHOLD) { // the special status On The Phone is state - // between DND and AWAY states. + // between DND and EXTENDED AWAY states. return ImageLoader .getImage(ImageLoader.USER_USER_ON_THE_PHONE_ICON); } + else if(connectivity < PresenceStatus.AWAY_THRESHOLD) + { + return ImageLoader + .getImage(ImageLoader.USER_EXTENDED_AWAY_ICON); + } else if(connectivity < PresenceStatus.AVAILABLE_THRESHOLD) { return ImageLoader diff --git a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java index 256ba91..67f735b 100644 --- a/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java +++ b/src/net/java/sip/communicator/impl/gui/utils/ImageLoader.java @@ -1326,6 +1326,12 @@ public class ImageLoader = new ImageID("service.gui.statusicons.USER_AWAY_ICON"); /** + * Contact "away" icon. + */ + public static final ImageID USER_EXTENDED_AWAY_ICON + = new ImageID("service.gui.statusicons.USER_EXTENDED_AWAY_ICON"); + + /** * Contact "free for chat" icon. */ public static final ImageID USER_FFC_ICON diff --git a/src/net/java/sip/communicator/service/protocol/PresenceStatus.java b/src/net/java/sip/communicator/service/protocol/PresenceStatus.java index 76a27c3..7e1aaa0 100644 --- a/src/net/java/sip/communicator/service/protocol/PresenceStatus.java +++ b/src/net/java/sip/communicator/service/protocol/PresenceStatus.java @@ -38,8 +38,10 @@ public class PresenceStatus /** * An integer above which all values of the status coefficient indicate both * connectivity and availability but the person is away from the computer. + * This value has special meaning, it is the border between dnd and away and + * statuses with this value are normally considered on the phone. */ - public static final int EXTENDED_AWAY_THRESHOLD = 32; + public static final int EXTENDED_AWAY_THRESHOLD = 31; /** * An integer above which all values of the status coefficient indicate both |