commit e915fe7c58cd2eefc8a876f40e4df3e55e6abc5f
from: wkj <devnull@localhost>
date: Thu Jun 24 00:36:58 2004 UTC

Fix from rob.

commit - 60f5a9986075e5d65e86d9f0e610b81221773f8d
commit + e915fe7c58cd2eefc8a876f40e4df3e55e6abc5f
blob - 55bd584a5526cbb9ebc6e3f4960172adb15f02ae
blob + a5881c0aab42cf8a3c45ae104a5dd03eb1f82fe7
--- lib/gv.resource
+++ lib/gv.resource
@@ -1,16 +1,15 @@
-GV.scales:              Natural size,   1.000,  screen  \n\
-                              Pixel based,    1.000,  pixel   \n\
-                              0.100,          0.100           \n\
-                              0.125,          0.125           \n\
-                              0.250,          0.250           \n\
-                              0.500,          0.500           \n\
-                              0.707,          0.707           \n\
-                              1.000,          1.000           \n\
-                              1.414,          1.530           \n\
-                              2.000,          2.000           \n\
-                              2.400,          2.750           \n\
-                              4.000,          4.000           \n\
-                              8.000,          8.000           \n\
-                              10.00,          10.00
-
-GV.reverseScrolling: True
+       GV.scaleBase:	       1
+       GV.scales:	       Natural size,   1.000,  screen  \n\
+			       Pixel based,    1.000,  pixel   \n\
+			       0.100,	       0.100	       \n\
+			       0.125,	       0.125	       \n\
+			       0.250,	       0.250	       \n\
+			       0.500,	       0.500	       \n\
+			       0.707,	       0.707	       \n\
+			       1.000,	       1.000	       \n\
+			       1.414,	       1.414	       \n\
+			       2.828,	       2.828	       \n\
+			       3.000,	       3.000	       \n\
+			       4.000,	       4.000	       \n\
+			       8.000,	       8.000	       \n\
+			       10.00,	       10.00
blob - 4d7f2238ee6caadc4f497ff83d8626981a731576
blob + 4ab2979aa14f76ba49ae9769c7347c9e0a23d1f8
--- src/libdraw/x11-init.c
+++ src/libdraw/x11-init.c
@@ -349,7 +349,7 @@ xattach(char *label)
 			home = getenv("home");
 			if(home == nil)
 				home = getenv("HOME");
-			if(home!=nil && (file=smprint("%s/.Xdefaults")) != nil){
+			if(home!=nil && (file=smprint("%s/.Xdefaults", home)) != nil){
 				XrmCombineFileDatabase(file, &database, False);
 				free(file);
 			}