Adds property to disable video bridge menu and functionality. Patch contributed by Tom Denham.

src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java

@@ -422,6 +422,14 @@ private List<ProtocolProviderService> getVideoBridgeProviders()
      */
     private void initVideoBridgeMenu()
     {
+        // If video bridge is enabled in the config then add the menu item
+        if (GuiActivator.getConfigurationService()
+             .getBoolean(OperationSetVideoBridge
+                .IS_VIDEO_BRIDGE_DISABLED, false))
+        {
+            return;
+        }
+
         if (!SwingUtilities.isEventDispatchThread())
         {
             SwingUtilities.invokeLater(new Runnable()

src/net/java/sip/communicator/impl/protocol/jabber/ProtocolProviderServiceJabberImpl.java

@@ -1728,9 +1728,19 @@ protected void initialize(String screenname,
                     OperationSetBasicAutoAnswer.class,
                     new OperationSetAutoAnswerJabberImpl(this));
 
-                addSupportedOperationSet(
-                    OperationSetVideoBridge.class,
-                    new OperationSetVideoBridgeImpl(this));
+                // Only init video bridge if enabled
+                boolean isVideoBridgeDisabled
+                    = JabberActivator.getConfigurationService()
+                      .getBoolean(OperationSetVideoBridge.
+                          IS_VIDEO_BRIDGE_DISABLED, false);
+
+                if (!isVideoBridgeDisabled)
+                {
+                    // init video bridge
+                    addSupportedOperationSet(
+                        OperationSetVideoBridge.class,
+                        new OperationSetVideoBridgeImpl(this));
+                }
 
                 // init DTMF
                 OperationSetDTMFJabberImpl operationSetDTMFSip
@@ -1800,7 +1810,7 @@ protected void initialize(String screenname,
             addSupportedOperationSet(OperationSetMessageCorrection.class,
                     basicInstantMessaging);
 
-            OperationSetChangePassword opsetChangePassword 
+            OperationSetChangePassword opsetChangePassword
                     = new OperationSetChangePasswordJabberImpl(this);
             addSupportedOperationSet(OperationSetChangePassword.class,
                     opsetChangePassword);

src/net/java/sip/communicator/plugin/update/UpdateActivator.java

@@ -177,6 +177,8 @@ public void start(BundleContext bundleContext) throws Exception
 
         UpdateActivator.bundleContext = bundleContext;
 
+        ConfigurationService cfg = getConfiguration();
+
         if (OSUtils.IS_WINDOWS)
         {
             updateService = new Update();
@@ -186,8 +188,6 @@ public void start(BundleContext bundleContext) throws Exception
                 updateService,
                 null);
 
-            ConfigurationService cfg = getConfiguration();
-
             // Register the "Check for Updates" menu item if
             // the "Check for Updates" property isn't disabled.
             if(!cfg.getBoolean(CHECK_FOR_UPDATES_MENU_DISABLED_PROP, false))
@@ -218,7 +218,7 @@ public void start(BundleContext bundleContext) throws Exception
         if (logger.isDebugEnabled())
             logger.debug("Update checker [REGISTERED]");
 
-        if (configuration.getBoolean(CHECK_FOR_UPDATES_DAILY_ENABLED_PROP,
+        if (cfg.getBoolean(CHECK_FOR_UPDATES_DAILY_ENABLED_PROP,
                                      false))
         {
             logger.info("Scheduled update checking enabled");

src/net/java/sip/communicator/service/protocol/OperationSetVideoBridge.java

@@ -15,6 +15,13 @@
 public interface OperationSetVideoBridge
     extends OperationSet
 {
+    /**
+     * The name of the property under which the user may specify if
+     * video bridge should be disabled.
+     */
+    public static final String IS_VIDEO_BRIDGE_DISABLED
+        = "net.java.sip.communicator.service.protocol.VIDEO_BRIDGE_DISABLED";
+
     /**
      * Creates a conference call with the specified callees as call peers via a
      * video bridge provided by the parent Jabber provider.