w3m

commit 963828c2e223402fa1bc5d6c057a76b47b988462
parent 9f000a40385f9f4d42e8101055fc307d90b687b1
Author: ukai <ukai>
Date:   Thu, 14 Feb 2002 03:50:03 +0000

[w3m-dev 03055] LIB_DIR -> w3m_lib_dir()
* image.c (getCharSize): s/LIB_DIR/w3m_lib_dir()/
* image.c (openImgdisplay): ditto
* image.c (getImageSize): ditto
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
image.c
 | 
6
+++---

2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,12 @@
 2002-02-14  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
 
+	* [w3m-dev 03055] LIB_DIR -> w3m_lib_dir()
+	* image.c (getCharSize): s/LIB_DIR/w3m_lib_dir()/
+	* image.c (openImgdisplay): ditto
+	* image.c (getImageSize): ditto
+
+2002-02-14  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
 	* [w3m-dev 03048] garbage of images on the right edge of termical.
 	* display.c (redrawLineImage): fix width calculation
 
diff --git a/image.c b/image.c
@@ -53,7 +53,7 @@ getCharSize()
 
     tmp = Strnew();
     if (!strchr(Imgdisplay, '/'))
-	Strcat_m_charp(tmp, LIB_DIR, "/", NULL);
+	Strcat_m_charp(tmp, w3m_lib_dir(), "/", NULL);
     Strcat_m_charp(tmp, Imgdisplay, " -test 2> /dev/null", NULL);
     f = popen(tmp->ptr, "r");
     if (!f)
@@ -115,7 +115,7 @@ openImgdisplay()
 	dup2(fdr[1], 1);
 	close(2);
 	if (!strchr(Imgdisplay, '/'))
-	    cmd = Strnew_m_charp(LIB_DIR, "/", Imgdisplay, NULL)->ptr;
+	    cmd = Strnew_m_charp(w3m_lib_dir(), "/", Imgdisplay, NULL)->ptr;
 	else
 	    cmd = Imgdisplay;
 	execl("/bin/sh", "sh", "-c", cmd, NULL);
@@ -594,7 +594,7 @@ getImageSize(ImageCache * cache)
 	return FALSE;
     tmp = Strnew();
     if (!strchr(Imgsize, '/'))
-	Strcat_m_charp(tmp, LIB_DIR, "/", NULL);
+	Strcat_m_charp(tmp, w3m_lib_dir(), "/", NULL);
     Strcat_m_charp(tmp, Imgsize, " ", shell_quote(cache->file),
 		   " 2> /dev/null", NULL);
     f = popen(tmp->ptr, "r");