SOURCES: psi-home_etc.patch - updated for psi 0.11

[hawk]

Author: hawk                         Date: Fri Jan 25 15:35:06 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for psi 0.11

---- Files affected:
SOURCES:
   psi-home_etc.patch (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/psi-home_etc.patch
diff -u SOURCES/psi-home_etc.patch:1.6 SOURCES/psi-home_etc.patch:1.7
--- SOURCES/psi-home_etc.patch:1.6	Sun Feb 20 17:03:58 2005
+++ SOURCES/psi-home_etc.patch	Fri Jan 25 16:35:01 2008
@@ -1,20 +1,19 @@
-diff -urN psi-old/src/common.cpp psi/src/common.cpp
---- psi-old/src/common.cpp	2004-02-15 20:24:02.615978632 +0100
-+++ psi/src/common.cpp	2004-02-15 20:24:11.393644224 +0100
-@@ -1296,7 +1296,8 @@
+--- psi-0.11/src/applicationinfo.cpp.orig	2007-10-14 16:00:51.000000000 +0200
++++ psi-0.11/src/applicationinfo.cpp	2008-01-25 16:32:03.390665615 +0100
+@@ -131,7 +131,8 @@
+ 		return p;
  
- QString getHomeDir()
- {
+ #if defined(Q_WS_X11)
 -	QDir proghome(QDir::homeDirPath() + "/.psi");
 +	char *home_etc = getenv("HOME_ETC");
 +	QDir proghome((home_etc != NULL && (strncmp(home_etc, "", 1) != 0) ? QString(home_etc) : QDir::homeDirPath()) + "/.psi");
  	if(!proghome.exists()) {
  		QDir home = QDir::home();
  		home.mkdir(".psi");
-@@ -1387,7 +1388,8 @@
+@@ -160,7 +161,8 @@
  
- QString getHomeDir()
- {
+ 	return proghome.path();
+ #elif defined(Q_WS_MAC)
 -	QDir proghome(QDir::homeDirPath() + "/.psi");
 +	char *home_etc = getenv("HOME_ETC");
 +	QDir proghome((home_etc != NULL && (strncmp(home_etc, "", 1) != 0) ? QString(home_etc) : QDir::homeDirPath()) + "/.psi");
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/psi-home_etc.patch?r1=1.6&r2=1.7&f=u