cairo: Undo previous; do NOT use glib. Require colors (no names).

diff --git a/src/cairo/cairo.scm b/src/cairo/cairo.scm
index e6bd01114496c354607e4a63137c7ecbce4912a6..79da4f4d2827981755b5c92f32deaa7be41bec1f 100644 (file)
--- a/src/cairo/cairo.scm
+++ b/src/cairo/cairo.scm
@@ -124,12 +124,11 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 (define (cairo-pattern-add-color-stop pattern offset color)
   (guarantee-cairo-pattern pattern 'cairo-pattern-add-color-stop)
-  (let ((c (if (color? color)
-              color
-              (with-glib-lock
-               (lambda () (->color color 'cairo-pattern-add-color-stop))))))
-    (C-call "cairo_pattern_add_color_stop_rgba" pattern (->flonum offset)
-           (color-red c) (color-green c) (color-blue c) (color-alpha c))))
+  (guarantee-color color 'cairo-pattern-add-color-stop)
+  (C-call "cairo_pattern_add_color_stop_rgba"
+         pattern (->flonum offset)
+         (color-red color) (color-green color) (color-blue color)
+         (color-alpha color)))
 \f
 (define (cairo-create surface)
   (guarantee-cairo-surface surface 'cairo-create)
@@ -186,12 +185,10 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 (define (cairo-set-source-color cairo color)
   (guarantee-cairo cairo 'cairo-set-source-color)
-  (let ((c (if (color? color)
-              color
-              (with-glib-lock
-               (lambda () (->color color 'cairo-set-source-color))))))
-    (C-call "cairo_set_source_rgba" cairo
-           (color-red c) (color-green c) (color-blue c) (color-alpha c))))
+  (guarantee-color color 'cairo-set-source-color)
+  (C-call "cairo_set_source_rgba" cairo
+         (color-red color) (color-green color) (color-blue color)
+         (color-alpha color)))
 
 (define (cairo-set-source cairo pattern)
   (guarantee-cairo cairo 'cairo-set-source)