X-Git-Url: https://git.pld-linux.org/?p=packages%2Firssi.git;a=blobdiff_plain;f=irssi-home_etc.patch;h=990e6a41d5333e25b3a98bb688e562f10c998304;hp=b848d8af11aae11071448550b8c58d7ff5c1654f;hb=9ccdd39997de7dde54616096ec6e8170c732d0db;hpb=5a5216837fc2e209550e1aeb4a3038c31abb7289

diff --git a/irssi-home_etc.patch b/irssi-home_etc.patch
index b848d8a..990e6a4 100644
--- a/irssi-home_etc.patch
+++ b/irssi-home_etc.patch
@@ -1,4 +1,3 @@
-diff -Nru irssi-0.8.6.orig/src/core/core.c irssi-0.8.6/src/core/core.c
 --- irssi-0.8.6.orig/src/core/core.c	2002-10-19 20:00:06.000000000 +0200
 +++ irssi-0.8.6/src/core/core.c	2003-11-09 12:46:25.000000000 +0100
 @@ -193,7 +193,9 @@
@@ -11,38 +10,21 @@ diff -Nru irssi-0.8.6.orig/src/core/core.c irssi-0.8.6/src/core/core.c
 +			home = g_get_home_dir();
  		if (home == NULL)
  			home = ".";
- 
-diff -Nru irssi-0.8.6.orig/src/core/log-away.c irssi-0.8.6/src/core/log-away.c
---- irssi-0.8.6.orig/src/core/log-away.c	2001-07-15 16:07:48.000000000 +0200
-+++ irssi-0.8.6/src/core/log-away.c	2003-11-09 12:53:24.000000000 +0100
-@@ -104,8 +104,14 @@
- 	awaylog = NULL;
- 	away_filepos = 0;
+
+--- irssi-0.8.11/src/core/log-away.c.orig	2007-04-25 20:13:56.000000000 +0200
++++ irssi-0.8.11/src/core/log-away.c	2007-06-07 01:31:08.951362144 +0200
+@@ -105,7 +105,12 @@
  	away_msgs = 0;
--
--	settings_add_str("log", "awaylog_file", IRSSI_DIR_SHORT"/away.log");
+ 
+ 	awaylog_file = g_strconcat(get_irssi_dir(), "/away.log", NULL);
+-	settings_add_str("log", "awaylog_file", awaylog_file);
 +	char *home_etc = getenv("HOME_ETC");
-+	
 +	if (home_etc) {
-+		char *log = g_strdup_printf("%s/away.log", home_etc);
-+		
++		char *log = g_strdup_printf("%s/.irssi/away.log", home_etc);
 +		settings_add_str("log", "awaylog_file", log);
 +	} else
-+		settings_add_str("log", "awaylog_file", IRSSI_DIR_SHORT"/away.log");
- 	settings_add_str("log", "awaylog_level", "msgs hilight");
- 
- 	signal_add("log written", (SIGNAL_FUNC) sig_log_written);
-diff -Nru irssi-0.8.6.orig/src/lib-popt/poptconfig.c irssi-0.8.6/src/lib-popt/poptconfig.c
---- irssi-0.8.6.orig/src/lib-popt/poptconfig.c	2002-01-27 21:45:58.000000000 +0100
-+++ irssi-0.8.6/src/lib-popt/poptconfig.c	2003-11-09 12:36:55.000000000 +0100
-@@ -130,7 +130,9 @@
-     if (getuid() != geteuid()) return 0;
- #endif
- 
--    if ((home = getenv("HOME"))) {
-+    home = getenv("HOME_ETC");
-+		if (!home) home = getenv("HOME");
-+    if (home) {
- 	fn = malloc(strlen(home) + 20);
- 	strcpy(fn, home);
- 	strcat(fn, "/.popt");
++		settings_add_str("log", "awaylog_file", awaylog_file);
+ 	g_free(awaylog_file);
+ 	settings_add_level("log", "awaylog_level", "msgs hilight");
+
+