/hg/icedtea-web: C-part of plugin is now also trying to follow XDG

[jvanek at icedtea.classpath.org]

changeset df5cb12080fa in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=df5cb12080fa
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Oct 23 17:52:18 2013 +0200

	C-part of plugin is now also trying to follow XDG
	* plugin/icedteanp/IcedTeaParseProperties.cc: (user_properties_file) is now using XDG cached dir or its default variant in case that old file do not (should not!) exists


diffstat:

 ChangeLog                                  |   7 +++++++
 plugin/icedteanp/IcedTeaParseProperties.cc |  15 ++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r c6c2998cc359 -r df5cb12080fa ChangeLog
--- a/ChangeLog	Tue Oct 22 16:21:40 2013 -0400
+++ b/ChangeLog	Wed Oct 23 17:52:18 2013 +0200
@@ -1,3 +1,10 @@
+2013-10-23  Jiri Vanek  <jvanek at redhat.com>
+
+	C-part of plugin is now also trying to follow XDG
+	* plugin/icedteanp/IcedTeaParseProperties.cc: (user_properties_file) is
+	now using XDG cached dir or its default variant in case that old file do not
+	(should not!) exists
+
 2013-10-22  Omair Majid  <omajid at redhat.com>
 
 	* netx/net/sourceforge/jnlp/util/logging/LogConfig.java
diff -r c6c2998cc359 -r df5cb12080fa plugin/icedteanp/IcedTeaParseProperties.cc
--- a/plugin/icedteanp/IcedTeaParseProperties.cc	Tue Oct 22 16:21:40 2013 -0400
+++ b/plugin/icedteanp/IcedTeaParseProperties.cc	Wed Oct 23 17:52:18 2013 +0200
@@ -105,7 +105,20 @@
 string  user_properties_file(){
 	int myuid = getuid();
 	struct passwd *mypasswd = getpwuid(myuid);
-	return string(mypasswd->pw_dir)+"/.icedtea/"+default_file_ITW_deploy_props_name;
+	// try pre 1.5  file location
+	string old_name = string(mypasswd->pw_dir)+"/.icedtea/"+default_file_ITW_deploy_props_name;
+	//exists? then itw was not yet migrated. Use it
+	if (IcedTeaPluginUtilities::file_exists(old_name)) {
+		PLUGIN_ERROR("IcedTea-Web plugin is using out-dated configuration");
+		return old_name;
+	}
+	//we are probably  on XDG specification now
+	//is specified custom value?
+	if (getenv ("XDG_CONFIG_HOME") != NULL){
+		return string(getenv ("XDG_CONFIG_HOME"))+"/icedtea-web/"+default_file_ITW_deploy_props_name;
+	}
+	//if not then use default
+	return string(mypasswd->pw_dir)+"/.config/icedtea-web/"+default_file_ITW_deploy_props_name;
 }