--- gimp-2.6.6.orig/plug-ins/script-fu/scripts/carved-logo.scm 2008-11-21 07:43:45 +0900 +++ gimp-2.6.8/plug-ins/script-fu/scripts/carved-logo.scm 2010-03-09 03:19:44 +0900 @@ -168,7 +168,7 @@ SF-ADJUSTMENT _"Font size (pixels)" '(100 2 1000 1 10 0 1) SF-FONT _"Font" "Engraver" SF-FILENAME _"Background Image" - (string-append gimp-data-directory + (string-append (list->string (string->list gimp-data-directory)) "/scripts/images/texture3.jpg") SF-TOGGLE _"Carve raised text" FALSE SF-ADJUSTMENT _"Padding around text" '(10 0 1000 1 10 0 1) --- gimp-2.6.6.orig/plug-ins/script-fu/scripts/chrome-it.scm 2008-11-21 07:43:45 +0900 +++ gimp-2.6.8/plug-ins/script-fu/scripts/chrome-it.scm 2010-03-09 03:19:44 +0900 @@ -214,7 +214,7 @@ SF-ADJUSTMENT _"Chrome lightness" '(-47 -100 100 1 10 0 0) SF-ADJUSTMENT _"Chrome factor" '(0.75 0 1 0.1 0.01 2 0) SF-FILENAME _"Environment map" - (string-append gimp-data-directory + (string-append (list->string (string->list gimp-data-directory)) "/scripts/images/beavis.jpg") SF-COLOR _"Highlight balance" '(211 95 0) SF-COLOR _"Chrome balance" "black" --- gimp-2.6.6.orig/plug-ins/script-fu/scripts/crystal-logo.scm 2008-11-21 07:43:45 +0900 +++ gimp-2.6.8/plug-ins/script-fu/scripts/crystal-logo.scm 2010-03-09 03:19:44 +0900 @@ -216,10 +216,10 @@ SF-ADJUSTMENT _"Font size (pixels)" '(150 2 1000 1 10 0 1) SF-FONT _"Font" "Engraver" SF-FILENAME _"Background image" - (string-append gimp-data-directory + (string-append (list->string (string->list gimp-data-directory)) "/scripts/images/texture1.jpg") SF-FILENAME _"Environment map" - (string-append gimp-data-directory + (string-append (list->string (string->list gimp-data-directory)) "/scripts/images/beavis.jpg") ) --- gimp-2.6.6.orig/plug-ins/script-fu/scripts/mkbrush.scm 2008-11-21 07:43:45 +0900 +++ gimp-2.6.8/plug-ins/script-fu/scripts/mkbrush.scm 2010-03-09 03:19:44 +0900 @@ -28,7 +28,7 @@ (drawable (car (gimp-layer-new img width height GRAY-IMAGE "MakeBrush" 100 NORMAL-MODE))) - (filename (string-append gimp-directory + (filename (string-append (list->string (string->list gimp-directory)) "/brushes/r" (number->string width) "x" @@ -85,7 +85,7 @@ (drawable (car (gimp-layer-new img widthplus heightplus GRAY-IMAGE "MakeBrush" 100 NORMAL-MODE))) - (filename (string-append gimp-directory + (filename (string-append (list->string (string->list gimp-directory)) "/brushes/r" (number->string width) "x" @@ -147,7 +147,7 @@ (drawable (car (gimp-layer-new img width height GRAY-IMAGE "MakeBrush" 100 NORMAL-MODE))) - (filename (string-append gimp-directory + (filename (string-append (list->string (string->list gimp-directory)) "/brushes/e" (number->string width) "x" @@ -204,7 +204,7 @@ (drawable (car (gimp-layer-new img widthplus heightplus GRAY-IMAGE "MakeBrush" 100 NORMAL-MODE))) - (filename (string-append gimp-directory + (filename (string-append (list->string (string->list gimp-directory)) "/brushes/e" (number->string width) "x" --- gimp-2.6.6.orig/plug-ins/script-fu/scripts/paste-as-brush.scm 2008-11-21 07:43:45 +0900 +++ gimp-2.6.8/plug-ins/script-fu/scripts/paste-as-brush.scm 2010-03-09 03:19:44 +0900 @@ -30,7 +30,7 @@ (begin (set! brush-draw (car (gimp-image-get-active-drawable brush-image))) (set! type (car (gimp-drawable-type brush-draw))) - (set! path (string-append gimp-directory + (set! path (string-append (list->string (string->list gimp-directory)) "/brushes/" filename (number->string brush-image) --- gimp-2.6.6.orig/plug-ins/script-fu/scripts/paste-as-pattern.scm 2008-11-21 07:43:45 +0900 +++ gimp-2.6.8/plug-ins/script-fu/scripts/paste-as-pattern.scm 2010-03-09 03:19:44 +0900 @@ -27,7 +27,7 @@ (if (= TRUE (car (gimp-image-is-valid pattern-image))) (begin (set! pattern-draw (car (gimp-image-get-active-drawable pattern-image))) - (set! path (string-append gimp-directory + (set! path (string-append (list->string (string->list gimp-directory)) "/patterns/" filename (number->string pattern-image) --- gimp-2.6.6.orig/plug-ins/script-fu/scripts/select-to-brush.scm 2008-11-21 07:43:45 +0900 +++ gimp-2.6.8/plug-ins/script-fu/scripts/select-to-brush.scm 2010-03-09 03:19:44 +0900 @@ -102,7 +102,7 @@ (gimp-floating-sel-anchor floating-sel) ) - (set! filename2 (string-append gimp-directory + (set! filename2 (string-append (list->string (string->list gimp-directory)) "/brushes/" filename (number->string image) --- gimp-2.6.6.orig/plug-ins/script-fu/scripts/select-to-pattern.scm 2008-11-21 07:43:45 +0900 +++ gimp-2.6.8/plug-ins/script-fu/scripts/select-to-pattern.scm 2010-03-09 03:19:44 +0900 @@ -75,7 +75,7 @@ (let ((floating-sel (car (gimp-edit-paste pattern-draw FALSE)))) (gimp-floating-sel-anchor floating-sel)) - (set! filename2 (string-append gimp-directory + (set! filename2 (string-append (list->string (string->list gimp-directory)) "/patterns/" filename (number->string image) --- gimp-2.6.6.orig/plug-ins/script-fu/scripts/sota-chrome-logo.scm 2008-11-21 07:43:45 +0900 +++ gimp-2.6.8/plug-ins/script-fu/scripts/sota-chrome-logo.scm 2010-03-09 03:19:44 +0900 @@ -213,7 +213,7 @@ SF-ADJUSTMENT _"Font size (pixels)" '(150 2 1000 1 10 0 1) SF-FONT _"Font" "RoostHeavy" SF-FILENAME _"Environment map" - (string-append gimp-data-directory + (string-append (list->string (string->list gimp-data-directory)) "/scripts/images/beavis.jpg") SF-COLOR _"Highlight balance" '(211 95 0) SF-COLOR _"Chrome balance" "black" --- gimp-2.6.6.orig/plug-ins/script-fu/tinyscheme/scheme.c 2008-11-21 07:43:47 +0900 +++ gimp-2.6.8/plug-ins/script-fu/tinyscheme/scheme.c 2009-12-12 05:34:16 +0900 @@ -30,7 +30,6 @@ #endif #ifdef WIN32 # include -# define access(f,a) _access(f,a) #endif #if USE_DL # include "dynload.h" @@ -1354,7 +1353,7 @@ /* ========== Routines for Reading ========== */ static int file_push(scheme *sc, const char *fname) { - FILE *fin=fopen(fname,"rb"); + FILE *fin=g_fopen(fname,"rb"); if(fin!=0) { sc->file_i++; sc->load_stack[sc->file_i].kind=port_file|port_input; @@ -1394,7 +1393,7 @@ } else { rw="rb"; } - f=fopen(fn,rw); + f=g_fopen(fn,rw); if(f==0) { return 0; } @@ -4823,7 +4822,7 @@ scheme_define(&sc,sc.global_env,mk_symbol(&sc,"load-extension"),mk_foreign_func(&sc, scm_load_ext)); #endif argv++; - if(access(file_name,0)!=0) { + if(g_access(file_name,0)!=0) { char *p=getenv("TINYSCHEMEINIT"); if(p!=0) { file_name=p; @@ -4839,7 +4838,7 @@ if(strcmp(file_name,"-")==0) { fin=stdin; } else if(isfile) { - fin=fopen(file_name,"r"); + fin=g_fopen(file_name,"r"); } for(;*argv;argv++) { pointer value=mk_string(&sc,*argv); @@ -4849,7 +4848,7 @@ scheme_define(&sc,sc.global_env,mk_symbol(&sc,"*args*"),args); } else { - fin=fopen(file_name,"r"); + fin=g_fopen(file_name,"r"); } if(isfile && fin==0) { fprintf(stderr,"Could not open file %s\n",file_name);