/hg/icedtea-web: * netx/net/sourceforge/jnlp/browser/FirefoxPref...

[jvanek at icedtea.classpath.org]

changeset a066aa4c05fc in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a066aa4c05fc
author: Jiri Vanek <jvanek at redhat.com>
date: Tue May 02 15:42:35 2017 +0200

	* netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java (find) for windows, using different path firefox profile


diffstat:

 AUTHORS                                                         |   1 +
 ChangeLog                                                       |   7 +++++
 netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java |  12 ++++++++++
 3 files changed, 20 insertions(+), 0 deletions(-)

diffs (54 lines):

diff -r 1a6d7e45b0c8 -r a066aa4c05fc AUTHORS
--- a/AUTHORS	Tue May 02 10:34:49 2017 +0200
+++ b/AUTHORS	Tue May 02 15:42:35 2017 +0200
@@ -4,6 +4,7 @@
 Lillian Angel <langel at redhat.com>
 Andrew Azores <aazores at redhat.com>
 Deepak Bhole <dbhole at redhat.com>
+Adam Buchta <adbuch7 at gmail.com>
 Ricardo Martín Camarero <rickyepoderi at yahoo.es>
 Marcin Cieslak <marcin.cieslak at gmail.com>
 Danesh Dadachanji <ddadacha at redhat.com>
diff -r 1a6d7e45b0c8 -r a066aa4c05fc ChangeLog
--- a/ChangeLog	Tue May 02 10:34:49 2017 +0200
+++ b/ChangeLog	Tue May 02 15:42:35 2017 +0200
@@ -1,3 +1,10 @@
+2017-05-02  Adam Buchta  <adbuch7 at gmail.com>
+            Jiri Vanek <jvanek at redhat.com>
+
+	* AUTHORS: added Adam Buchta to authors
+	* netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java
+	(find) for windows, using different path firefox profile
+
 2017-05-02  Jiri Vanek <jvanek at redhat.com>
 
 	* launcher/launchers.bat.in: added 	INST_ITW_HOME=%~dp0/../ as default location for windows CP search
diff -r 1a6d7e45b0c8 -r a066aa4c05fc netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java
--- a/netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java	Tue May 02 10:34:49 2017 +0200
+++ b/netx/net/sourceforge/jnlp/browser/FirefoxPreferencesFinder.java	Tue May 02 15:42:35 2017 +0200
@@ -44,6 +44,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
 import net.sourceforge.jnlp.util.logging.OutputController;
@@ -66,6 +67,17 @@
         String configPath = System.getProperty("user.home") + File.separator + ".mozilla"
                 + File.separator + "firefox" + File.separator;
 
+        if (JNLPRuntime.isWindows()) {
+            Map<String, String> env = System.getenv();
+            if (env != null) {
+                String appdata = env.get("APPDATA");
+                if (appdata != null) {
+                    configPath = appdata + File.separator + "Mozilla"
+                            + File.separator + "Firefox" + File.separator;
+                }
+            }
+        }
+
         String profilesPath = configPath + "profiles.ini";
 
         if (!(new File(profilesPath).isFile())) {