Reverts the fix for issue #508: Support Quit, Preferences and About in the Mac application menu because there are attempts to load the Mac OS X-specific classes on Windows which are only available at compile time.

3 files changed, 49 insertions, 49 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java
index f95fe9c..ccb7fc5 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/FileMenu.java
@@ -182,19 +182,19 @@ public class FileMenu
 
     private boolean registerCloseMenuItemMacOSX()
     {
-        Application application = Application.getApplication();
-        if (application != null)
-        {
-            application.addApplicationListener(new ApplicationAdapter()
-            {
-                public void handleQuit(ApplicationEvent event)
-                {
-                    closeActionPerformed();
-                    event.setHandled(true);
-                }
-            });
-            return true;
-        }
+//        Application application = Application.getApplication();
+//        if (application != null)
+//        {
+//            application.addApplicationListener(new ApplicationAdapter()
+//            {
+//                public void handleQuit(ApplicationEvent event)
+//                {
+//                    closeActionPerformed();
+//                    event.setHandled(true);
+//                }
+//            });
+//            return true;
+//        }
         return false;
     }
 
diff --git a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java
index 7b4f484..d8f9895 100644
--- a/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java
+++ b/src/net/java/sip/communicator/impl/gui/main/menus/ToolsMenu.java
@@ -152,24 +152,24 @@ public class ToolsMenu
 
     private boolean registerConfigMenuItemMacOSX()
     {
-        Application application = Application.getApplication();
-        if (application != null)
-        {
-            application.addPreferencesMenuItem();
-            if (application.isPreferencesMenuItemPresent())
-            {
-                application.setEnabledPreferencesMenu(true);
-                application.addApplicationListener(new ApplicationAdapter()
-                {
-                    public void handlePreferences(ApplicationEvent event)
-                    {
-                        configActionPerformed();
-                        event.setHandled(true);
-                    }
-                });
-                return true;
-            }
-        }
+//        Application application = Application.getApplication();
+//        if (application != null)
+//        {
+//            application.addPreferencesMenuItem();
+//            if (application.isPreferencesMenuItemPresent())
+//            {
+//                application.setEnabledPreferencesMenu(true);
+//                application.addApplicationListener(new ApplicationAdapter()
+//                {
+//                    public void handlePreferences(ApplicationEvent event)
+//                    {
+//                        configActionPerformed();
+//                        event.setHandled(true);
+//                    }
+//                });
+//                return true;
+//            }
+//        }
         return false;
     }
 
diff --git a/src/net/java/sip/communicator/plugin/branding/BrandingActivator.java b/src/net/java/sip/communicator/plugin/branding/BrandingActivator.java
index 4606175..e637970 100644
--- a/src/net/java/sip/communicator/plugin/branding/BrandingActivator.java
+++ b/src/net/java/sip/communicator/plugin/branding/BrandingActivator.java
@@ -128,24 +128,24 @@ public class BrandingActivator
 
     private boolean registerMenuEntryMacOSX(UIService uiService)
     {
-        Application application = Application.getApplication();
-        if (application != null)
-        {
-            application.addAboutMenuItem();
-            if (application.isAboutMenuItemPresent())
-            {
-                application.setEnabledAboutMenu(true);
-                application.addApplicationListener(new ApplicationAdapter()
-                {
-                    public void handleAbout(ApplicationEvent event)
-                    {
-                        AboutWindowPluginComponent.actionPerformed();
-                        event.setHandled(true);
-                    }
-                });
-                return true;
-            }
-        }
+//        Application application = Application.getApplication();
+//        if (application != null)
+//        {
+//            application.addAboutMenuItem();
+//            if (application.isAboutMenuItemPresent())
+//            {
+//                application.setEnabledAboutMenu(true);
+//                application.addApplicationListener(new ApplicationAdapter()
+//                {
+//                    public void handleAbout(ApplicationEvent event)
+//                    {
+//                        AboutWindowPluginComponent.actionPerformed();
+//                        event.setHandled(true);
+//                    }
+//                });
+//                return true;
+//            }
+//        }
         return false;
     }