[sawfish/sawfish-1.5.0] make 1.5x compatible with rep-gtk 0.90.0

[Christopher Bratusek <chrisb src gnome org>]

commit 1414ceeb2f01da1e2d7fcd510bcf0a2f461ade8a
Author: chrisb <zanghar freenet de>
Date:   Mon Sep 14 20:04:58 2009 +0200

    make 1.5x compatible with rep-gtk 0.90.0

 ChangeLog                         |    4 ++
 lisp/sawfish/gtk/Makefile.in      |    3 +-
 lisp/sawfish/gtk/color-preview.jl |   66 -------------------------------------
 lisp/sawfish/gtk/widgets/color.jl |   41 +++++------------------
 4 files changed, 14 insertions(+), 100 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1d4595b..69ea6cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 
 	* configure.in: bump minimum rep-gtk to 0.90.0
 
+	* lisp/sawfish/gtk/color-preview.jl
+	* lisp/sawfish/gtk/widgets/color.jl: removed GtkButton + GtkPreview + GtkColorSelection by GtkColorButton
+	                                     makes 1.5s sawfish-ui compatible with rep-gtk 0.90.0
+
 2009-09-05  Christopher Bratusek <zanghar freenet de>
 	* configure.in: bump version to 1.5.2 ("Save The Robots")
 
diff --git a/lisp/sawfish/gtk/Makefile.in b/lisp/sawfish/gtk/Makefile.in
index b2db81e..92b11c7 100644
--- a/lisp/sawfish/gtk/Makefile.in
+++ b/lisp/sawfish/gtk/Makefile.in
@@ -29,8 +29,7 @@ VPATH= srcdir@:@top_srcdir@
 
 REP_ENVIRON:=$(REP_ENVIRON) REP_LOAD_PATH=$(top_srcdir)/lisp:$(top_builddir)/lisp
 
-SRCS :=	color-preview.jl	\
-	stock.jl		\
+SRCS :=	stock.jl		\
 	widget.jl		\
 	widget-dialog.jl	\
 	widget-test.jl
diff --git a/lisp/sawfish/gtk/widgets/color.jl b/lisp/sawfish/gtk/widgets/color.jl
index ae07e20..3194fd2 100644
--- a/lisp/sawfish/gtk/widgets/color.jl
+++ b/lisp/sawfish/gtk/widgets/color.jl
@@ -26,50 +26,27 @@
     (open rep
 	  gui.gtk-2.gtk
 	  rep.regexp
-	  sawfish.gtk.widget
-	  sawfish.gtk.color-preview)
+	  sawfish.gtk.widget)
 
   (defconst default-color "#000000")
 
   (define (make-color-item changed-callback)
     (let* ((value default-color)
-	   (button (button-new-with-color value)))
-      (g-signal-connect
-       button "clicked"
-       (lambda ()
-	 (let ((colorsel (gtk-color-selection-dialog-new (_ "Select color"))))
-	   (gtk-color-selection-set-color-interp
-	    (gtk-color-selection-dialog-colorsel colorsel)
-	    (gdk-color-parse-interp value))
-	   (g-signal-connect
-	    (gtk-color-selection-dialog-ok-button colorsel) "clicked"
-	    (lambda ()
-	      (let ((color (gtk-color-selection-get-color-interp
-			    (gtk-color-selection-dialog-colorsel colorsel))))
-		(setq value (format nil "#%04x%04x%04x"
-				    (gdk-color-red color)
-				    (gdk-color-green color)
-				    (gdk-color-blue color)))
-		(set-button-color button value)
-		(call-callback changed-callback)
-		(gtk-widget-destroy colorsel))))
-	   (g-signal-connect
-	    (gtk-color-selection-dialog-cancel-button colorsel) "clicked"
-	    (lambda () (gtk-widget-destroy colorsel)))
-	   (g-signal-connect colorsel "delete_event"
-			       (lambda () (gtk-widget-destroy colorsel)))
-	   (gtk-widget-hide (gtk-color-selection-dialog-help-button colorsel))
-	   (gtk-widget-show colorsel)
-	   (gtk-grab-add colorsel))))
+	   (button (gtk-color-button-new-with-color (gdk-color-parse-interp value))))
+      (g-signal-connect button "color-set"
+        (lambda ()
+	  (let ((color (gtk-color-button-get-color-interp button)))
+	    (setq value color)
+	    (call-callback changed-callback))))
       (gtk-widget-show button)
       (lambda (op)
 	(case op
 	  ((set) (lambda (x)
 		   (setq value x)
-		   (set-button-color button value)))
+		   (gtk-color-button-set-color button (gdk-color-parse-interp value))))
 	  ((clear) (lambda ()
 		     (setq value default-color)
-		     (set-button-color button nil)))
+		     (gtk-color-button-set-color button (gdk-color-parse-interp value))))
 	  ((ref) (lambda () value))
 	  ((gtk-widget) button)
 	  ((validp) (lambda (x)