http.client: remove http-get* and its friends, change http-request* and with-http...

[factor.git] / extra / xkcd / xkcd.factor

diff --git a/extra/xkcd/xkcd.factor b/extra/xkcd/xkcd.factor
index f47be6483ef8ac02ca03875133d0b1d8cdaf8b77..72f8af67f4a3926c2d4a228d26e05dd82f399be4 100644 (file)
--- a/extra/xkcd/xkcd.factor
+++ b/extra/xkcd/xkcd.factor
@@ -11,19 +11,18 @@ IN: xkcd
 <PRIVATE
 
 : comic-image ( url -- image )
-    http-get*
+    http-get nip
     R" http://imgs\.xkcd\.com/comics/[^\.]+\.(png|jpg)"
     first-match >string load-http-image ;
 
 : comic-image. ( url -- ) comic-image image. ;
 
 : comic-string ( url -- string )
-    http-get* string>xml
+    http-get nip string>xml
     "transcript" "id" deep-tag-with-attr children>string ;
 
 : comic-text. ( url -- )
-    comic-image
-    80 wrap-lines [ print ] each ;
+    comic-image 80 wrap-lines [ print ] each ;
 
 : comic. ( url -- )
     ui-running? [ comic-image. ] [ comic-text. ] if ;