From: lisu <lisu@pld-linux.org>
Date: Tue, 12 Apr 2011 19:33:50 +0000 (+0000)
Subject: - no longer used
X-Git-Tag: auto/th/psi-plus-0_15_3792-0_3792_1~5
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fpsi-plus.git;a=commitdiff_plain;h=dfb6ef0b4369bb58047828fb961b735c681e8820

- no longer used

Changed files:
    psi-plus-home_etc.patch -> 1.2
    psi-plus-no_online_offline_status.patch -> 1.2
---

diff --git a/psi-plus-home_etc.patch b/psi-plus-home_etc.patch
deleted file mode 100644
index c7d4403..0000000
--- a/psi-plus-home_etc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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;
- 
- #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");
-@@ -160,7 +161,8 @@
- 
- 	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");
- 	if(!proghome.exists()) {
- 		QDir home = QDir::home();
- 		home.mkdir(".psi");
diff --git a/psi-plus-no_online_offline_status.patch b/psi-plus-no_online_offline_status.patch
deleted file mode 100644
index 1b0aac7..0000000
--- a/psi-plus-no_online_offline_status.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- psi-0.12/src/psiaccount.cpp.orig	2008-05-14 23:33:03.000000000 +0200
-+++ psi-0.12/src/psiaccount.cpp	2008-08-01 17:56:28.000000000 +0200
-@@ -2988,11 +2988,11 @@
- void PsiAccount::changeStatus(int x)
- {
- 	if(x == STATUS_OFFLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-offline").toBool()) {
--		setStatus(Status(Status::Offline, "Logged out", 0));
-+		setStatus(Status("","",0,true));
- 	}
- 	else {
- 		if(x == STATUS_ONLINE && !PsiOptions::instance()->getOption("options.status.ask-for-message-on-online").toBool()) {
--			setStatus(Status());
-+			setStatus(Status("","",0,true));
- 		}
- 		else if(x == STATUS_INVISIBLE){
- 			Status s("","",0,true);