aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl/osdependent/jdic
diff options
context:
space:
mode:
authorYana Stamcheva <yana@jitsi.org>2011-05-11 10:26:57 +0000
committerYana Stamcheva <yana@jitsi.org>2011-05-11 10:26:57 +0000
commitf69a298f044ad5ccbc24bbb26885e54a3832add4 (patch)
treea5b9ab2fe0a7ccef7172bac4771de2935d75633c /src/net/java/sip/communicator/impl/osdependent/jdic
parent5151463dda370665651841af8882762fab52fe1e (diff)
downloadjitsi-f69a298f044ad5ccbc24bbb26885e54a3832add4.zip
jitsi-f69a298f044ad5ccbc24bbb26885e54a3832add4.tar.gz
jitsi-f69a298f044ad5ccbc24bbb26885e54a3832add4.tar.bz2
Fixes the active event notification handler set up.
Diffstat (limited to 'src/net/java/sip/communicator/impl/osdependent/jdic')
-rw-r--r--src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java b/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java
index abfe81d..c900d12 100644
--- a/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java
+++ b/src/net/java/sip/communicator/impl/osdependent/jdic/SystrayServiceJdicImpl.java
@@ -338,7 +338,7 @@ public class SystrayServiceJdicImpl
// auto switch to the configured one when it will be available.
// we will be aware of it since we listen for new registered
// service in the bundle context.
- if (activePopupHandler == null)
+ if (activePopupHandler == null && pph != null)
{
setActivePopupMessageHandler(pph);
}
@@ -678,12 +678,14 @@ public class SystrayServiceJdicImpl
} else
logger.warn("the following popup handler has not " +
"been added since it is already known : " + handler);
-
+
String configuredHandler = (String) configService.
getProperty("systray.POPUP_HANDLER");
-
- if (configuredHandler == null &&
- (handler.getPreferenceIndex() > activePopupHandler.getPreferenceIndex()))
+
+ if (configuredHandler == null
+ && (activePopupHandler == null
+ || (handler.getPreferenceIndex()
+ > activePopupHandler.getPreferenceIndex())))
{
// The user doesn't have a preferred handler set and new
// handler with better preference index has arrived,