Merge commit 'cf5da99'HEADmaster

Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de>

1 files changed, 18 insertions, 0 deletions

diff --git a/src/net/java/sip/communicator/util/UtilActivator.java b/src/net/java/sip/communicator/util/UtilActivator.java
index c2ee299..6dff186 100644
--- a/src/net/java/sip/communicator/util/UtilActivator.java
+++ b/src/net/java/sip/communicator/util/UtilActivator.java
@@ -22,6 +22,7 @@ import java.util.*;
 import net.java.sip.communicator.service.gui.*;
 import net.java.sip.communicator.service.protocol.*;
 import net.java.sip.communicator.service.resources.*;
+import net.java.sip.communicator.service.systray.*;
 
 import org.jitsi.service.configuration.*;
 import org.jitsi.service.fileaccess.*;
@@ -65,6 +66,8 @@ public class UtilActivator
 
     private static AlertUIService alertUIService;
 
+    private static SystrayService systrayService;
+
     /**
      * Calls <tt>Thread.setUncaughtExceptionHandler()</tt>
      *
@@ -184,6 +187,21 @@ public class UtilActivator
     }
 
     /**
+     * Gets the <tt>SystrayService</tt> instance registered in the
+     * <tt>BundleContext</tt> of the <tt>UtilActivator</tt>.
+     *
+     * @return the <tt>SystrayService</tt> instance registered in the
+     * <tt>BundleContext</tt> of the <tt>UtilActivator</tt>
+     */
+    public static SystrayService getSystrayService()
+    {
+        if (systrayService == null)
+            systrayService =
+                ServiceUtils.getService(bundleContext, SystrayService.class);
+        return systrayService;
+    }
+
+    /**
      * Returns the <tt>FileAccessService</tt> obtained from the bundle context.
      *
      * @return the <tt>FileAccessService</tt> obtained from the bundle context