--- a/ChangeLog	Thu Jun 18 10:58:02 2009 +0200
+++ b/ChangeLog	Tue Aug 04 11:34:49 2009 -0400
@@ -1,3 +1,8 @@
+2009-08-04  Omair Majid  <omajid@redhat.com>
+
+	* netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java
+	(initialize): Disable creation of desktop shortcuts.
+
 2009-06-18  Mark Wielaard  <mark@klomp.org>
 
 	* netx/net/sourceforge/jnlp/services/XExtendedService.java

--- a/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java	Thu Jun 18 10:58:02 2009 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java	Tue Aug 04 11:34:49 2009 -0400
@@ -109,7 +109,24 @@
      */
     public void initialize() {
         installEnvironment();
-        addMenuAndDesktopEntries();
+        
+        /*
+         * FIXME: Disable creating desktop entries for now
+         * 
+         * there are some major issues we need to work out before we can enable them
+         * 1. Playing nice with the altnatives system
+         *   - use the system preferred jdk (/usr/bin/javaws)
+         *   - dont assume what jdk javaws corresponds to
+         *   - make sure our shortcuts work with the sun jdk and vice versa 
+         *     (may not be possible since sun's javaws creates a launcher that
+         *     links to /usr/java/${ver}/bin/javaws)
+         *   - we should use the same options and arguments as sun's javaws
+         * 2. Make shortcuts work offline 
+         *   - make the cache updates and replacements work properly
+         *   - shortcuts should use the cache
+         *   
+         *  addMenuAndDesktopEntries();
+         */
     }
 
     /**