[packages/sodipodi.git] / sodipodi-home_etc.patch

diff -urN aa/sodipodi-0.34/src/libnrtype/nr-type-directory.c sodipodi-0.34/src/libnrtype/nr-type-directory.c
--- aa/sodipodi-0.34/src/libnrtype/nr-type-directory.c	2004-01-02 19:19:19.000000000 +0100
+++ sodipodi-0.34/src/libnrtype/nr-type-directory.c	2004-02-12 14:23:09.601744192 +0100
@@ -448,7 +448,7 @@
 	int len;
 	struct stat st;
 
-	homedir = getenv ("HOME");
+	homedir = g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_getenv ("HOME");
 	if (!homedir) return;
 	len = strlen (homedir);
 	filename = nr_new (unsigned char, len + sizeof (privatename) + 1);
diff -urN aa/sodipodi-0.34/src/main.c sodipodi-0.34/src/main.c
--- aa/sodipodi-0.34/src/main.c	2004-02-08 14:42:01.000000000 +0100
+++ sodipodi-0.34/src/main.c	2004-02-12 14:21:34.772160480 +0100
@@ -718,7 +718,7 @@
 
 	g_warning ("Emergency save activated");
 
-	home = g_get_home_dir ();
+	home = g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir ();
 	sptime = time (NULL);
 	sptm = localtime (&sptime);
 	strftime (sptstr, 256, "%Y_%m_%d_%H_%M_%S", sptm);
diff -urN aa/sodipodi-0.34/src/sodipodi.c sodipodi-0.34/src/sodipodi.c
--- aa/sodipodi-0.34/src/sodipodi.c	2004-02-05 19:23:22.000000000 +0100
+++ sodipodi-0.34/src/sodipodi.c	2004-02-12 14:20:37.873810344 +0100
@@ -401,7 +401,7 @@
 	fnutf8 = g_build_filename (SODIPODI_APPDATADIR, filename, NULL);
 	fnos = g_filename_from_utf8 (fnutf8, strlen (fnutf8), &bytesin, &bytesout, NULL);
 #else
-	fnutf8 = g_build_filename (g_get_home_dir (), ".sodipodi", filename, NULL);
+	fnutf8 = g_build_filename (g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir (), ".sodipodi", filename, NULL);
 	fnos = g_filename_from_utf8 (fnutf8, strlen (fnutf8), &bytesin, &bytesout, NULL);
 #endif
 	if (stat (fnos, &s)) {
@@ -505,7 +505,7 @@
 #ifdef WIN32
 	fn = g_build_filename (SODIPODI_APPDATADIR, "preferences", NULL);
 #else
-	fn = g_build_filename (g_get_home_dir (), ".sodipodi/preferences", NULL);
+	fn = g_build_filename (g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir (), ".sodipodi/preferences", NULL);
 #endif
 
 	sp_repr_doc_write_file (sodipodi->preferences, fn);
@@ -521,7 +521,7 @@
 #ifdef WIN32
 	fn = g_build_filename (SODIPODI_APPDATADIR, "extensions", NULL);
 #else
-	fn = g_build_filename (g_get_home_dir (), ".sodipodi/extensions", NULL);
+	fn = g_build_filename (g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir (), ".sodipodi/extensions", NULL);
 #endif
 
 	sp_repr_doc_write_file (sodipodi->extensions, fn);
@@ -764,7 +764,7 @@
 #ifdef WIN32
 	dnutf8 = g_strdup (SODIPODI_APPDATADIR);
 #else
-	dnutf8 = g_build_filename (g_get_home_dir (), ".sodipodi", NULL);
+	dnutf8 = g_build_filename (g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir (), ".sodipodi", NULL);
 #endif
 	dnos = g_filename_from_utf8 (dnutf8, strlen (dnutf8), &bytesin, &bytesout, NULL);
 	if (stat (dnos, &s)) {
@@ -795,7 +795,7 @@
 	fnos = g_filename_from_utf8 (fnutf8, strlen (fnutf8), &bytesin, &bytesout, NULL);
 	fh = creat (fnos, S_IREAD | S_IWRITE);
 #else
-	fnutf8 = g_build_filename (g_get_home_dir (), ".sodipodi", config_name, NULL);
+	fnutf8 = g_build_filename (g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir (), ".sodipodi", config_name, NULL);
 	fnos = g_filename_from_utf8 (fnutf8, strlen (fnutf8), &bytesin, &bytesout, NULL);
 	fh = creat (fnos, S_IRUSR | S_IWUSR | S_IRGRP);
 #endif
diff -urN aa/sodipodi-0.34/src/system.h sodipodi-0.34/src/system.h
--- aa/sodipodi-0.34/src/system.h	2003-12-07 12:31:40.000000000 +0100
+++ sodipodi-0.34/src/system.h	2004-02-12 14:18:02.538424912 +0100
@@ -36,7 +36,7 @@
 #ifdef WIN32
 #define SODIPODI_APPDATADIR sp_win32_get_appdata_dir ()
 #else
-#define SODIPODI_APPDATADIR g_get_home_dir ()
+#define SODIPODI_APPDATADIR g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir ()
 #endif
 #endif
 
@@ -46,7 +46,7 @@
 #ifdef WIN32
 #define SODIPODI_DOCDIR sp_win32_get_doc_dir ()
 #else
-#define SODIPODI_DOCDIR g_get_home_dir ()
+#define SODIPODI_DOCDIR g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir ()
 #endif
 #endif
Commit	Line	Data
876bd9ae	1	diff -urN aa/sodipodi-0.34/src/libnrtype/nr-type-directory.c sodipodi-0.34/src/libnrtype/nr-type-directory.c
	2	--- aa/sodipodi-0.34/src/libnrtype/nr-type-directory.c 2004-01-02 19:19:19.000000000 +0100
	3	+++ sodipodi-0.34/src/libnrtype/nr-type-directory.c 2004-02-12 14:23:09.601744192 +0100
	4	@@ -448,7 +448,7 @@
ee1c08b3	5	int len;
	6	struct stat st;
	7
	8	- homedir = getenv ("HOME");
876bd9ae	9	+ homedir = g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_getenv ("HOME");
ee1c08b3	10	if (!homedir) return;
	11	len = strlen (homedir);
	12	filename = nr_new (unsigned char, len + sizeof (privatename) + 1);
876bd9ae	13	diff -urN aa/sodipodi-0.34/src/main.c sodipodi-0.34/src/main.c
	14	--- aa/sodipodi-0.34/src/main.c 2004-02-08 14:42:01.000000000 +0100
	15	+++ sodipodi-0.34/src/main.c 2004-02-12 14:21:34.772160480 +0100
	16	@@ -718,7 +718,7 @@
f7384d48	17
ee1c08b3	18	g_warning ("Emergency save activated");
ee1c08b3	19
f7384d48 MK	20	- home = g_get_home_dir ();
f7384d48 MK	21	+ home = g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir ();
ee1c08b3	22	sptime = time (NULL);
	23	sptm = localtime (&sptime);
	24	strftime (sptstr, 256, "%Y_%m_%d_%H_%M_%S", sptm);
876bd9ae	25	diff -urN aa/sodipodi-0.34/src/sodipodi.c sodipodi-0.34/src/sodipodi.c
	26	--- aa/sodipodi-0.34/src/sodipodi.c 2004-02-05 19:23:22.000000000 +0100
	27	+++ sodipodi-0.34/src/sodipodi.c 2004-02-12 14:20:37.873810344 +0100
	28	@@ -401,7 +401,7 @@
	29	fnutf8 = g_build_filename (SODIPODI_APPDATADIR, filename, NULL);
	30	fnos = g_filename_from_utf8 (fnutf8, strlen (fnutf8), &bytesin, &bytesout, NULL);
ee1c08b3	31	#else
876bd9ae	32	- fnutf8 = g_build_filename (g_get_home_dir (), ".sodipodi", filename, NULL);
	33	+ fnutf8 = g_build_filename (g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir (), ".sodipodi", filename, NULL);
	34	fnos = g_filename_from_utf8 (fnutf8, strlen (fnutf8), &bytesin, &bytesout, NULL);
ee1c08b3	35	#endif
876bd9ae	36	if (stat (fnos, &s)) {
876bd9ae	37	@@ -505,7 +505,7 @@
ee1c08b3	38	#ifdef WIN32
f7384d48	39	fn = g_build_filename (SODIPODI_APPDATADIR, "preferences", NULL);
ee1c08b3	40	#else
ee1c08b3	41	- fn = g_build_filename (g_get_home_dir (), ".sodipodi/preferences", NULL);
f7384d48	42	+ fn = g_build_filename (g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir (), ".sodipodi/preferences", NULL);
ee1c08b3	43	#endif
ee1c08b3	44
876bd9ae	45	sp_repr_doc_write_file (sodipodi->preferences, fn);
	46	@@ -521,7 +521,7 @@
	47	#ifdef WIN32
	48	fn = g_build_filename (SODIPODI_APPDATADIR, "extensions", NULL);
	49	#else
	50	- fn = g_build_filename (g_get_home_dir (), ".sodipodi/extensions", NULL);
	51	+ fn = g_build_filename (g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir (), ".sodipodi/extensions", NULL);
	52	#endif
	53
	54	sp_repr_doc_write_file (sodipodi->extensions, fn);
	55	@@ -764,7 +764,7 @@
ee1c08b3	56	#ifdef WIN32
876bd9ae	57	dnutf8 = g_strdup (SODIPODI_APPDATADIR);
ee1c08b3	58	#else
876bd9ae	59	- dnutf8 = g_build_filename (g_get_home_dir (), ".sodipodi", NULL);
876bd9ae	60	+ dnutf8 = g_build_filename (g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir (), ".sodipodi", NULL);
ee1c08b3	61	#endif
876bd9ae	62	dnos = g_filename_from_utf8 (dnutf8, strlen (dnutf8), &bytesin, &bytesout, NULL);
	63	if (stat (dnos, &s)) {
	64	@@ -795,7 +795,7 @@
	65	fnos = g_filename_from_utf8 (fnutf8, strlen (fnutf8), &bytesin, &bytesout, NULL);
	66	fh = creat (fnos, S_IREAD \| S_IWRITE);
ee1c08b3	67	#else
876bd9ae	68	- fnutf8 = g_build_filename (g_get_home_dir (), ".sodipodi", config_name, NULL);
	69	+ fnutf8 = g_build_filename (g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir (), ".sodipodi", config_name, NULL);
	70	fnos = g_filename_from_utf8 (fnutf8, strlen (fnutf8), &bytesin, &bytesout, NULL);
	71	fh = creat (fnos, S_IRUSR \| S_IWUSR \| S_IRGRP);
ee1c08b3	72	#endif
876bd9ae	73	diff -urN aa/sodipodi-0.34/src/system.h sodipodi-0.34/src/system.h
	74	--- aa/sodipodi-0.34/src/system.h 2003-12-07 12:31:40.000000000 +0100
	75	+++ sodipodi-0.34/src/system.h 2004-02-12 14:18:02.538424912 +0100
	76	@@ -36,7 +36,7 @@
f7384d48 MK	77	#ifdef WIN32
	78	#define SODIPODI_APPDATADIR sp_win32_get_appdata_dir ()
	79	#else
	80	-#define SODIPODI_APPDATADIR g_get_home_dir ()
	81	+#define SODIPODI_APPDATADIR g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir ()
	82	#endif
	83	#endif
	84
876bd9ae	85	@@ -46,7 +46,7 @@
	86	#ifdef WIN32
	87	#define SODIPODI_DOCDIR sp_win32_get_doc_dir ()
	88	#else
	89	-#define SODIPODI_DOCDIR g_get_home_dir ()
	90	+#define SODIPODI_DOCDIR g_getenv("HOME_ETC") ? g_getenv("HOME_ETC") : g_get_home_dir ()
	91	#endif
	92	#endif
	93