[sawfish] Moved contents of wm/extras.jl to wm/frames.jl, and deleted extras.jl.

[Christopher Bratusek <chrisb src gnome org>]

commit de2d1a8ce523c8d614836c1e03e5007eb3b226c2
Author: Teika kazura <teika lavabit com>
Date:   Tue Nov 3 16:49:10 2009 +0900

    Moved contents of wm/extras.jl to wm/frames.jl, and deleted extras.jl.

 lisp/sawfish/wm/extras.jl |   44 --------------------------------------------
 lisp/sawfish/wm/frames.jl |   24 +++++++++++++++++++++++-
 lisp/sawfish/wm/user.jl   |    1 -
 3 files changed, 23 insertions(+), 46 deletions(-)
---
diff --git a/lisp/sawfish/wm/frames.jl b/lisp/sawfish/wm/frames.jl
index 4a0a030..8f0e558 100644
--- a/lisp/sawfish/wm/frames.jl
+++ b/lisp/sawfish/wm/frames.jl
@@ -238,6 +238,27 @@ generate.")
   (defvar default-bevel-percent nil
     "Bevel intensity as a percentage.")
 
+  ;; frame fonts & colors
+  (defcustom use-custom-font-color '()
+    "Use custom font colors for frames"
+    :type boolean
+    :group appearance
+    :after-set (lambda () (update-frame-font-color)))
+
+  (defcustom frame-font-active-color "black"
+    "Font color for active frames"
+    :type color
+    :group appearance
+    :depends use-custom-font-color
+    :after-set (lambda () (update-frame-font-color)))
+
+  (defcustom frame-font-inactive-color "black"
+    "Font color for inactive frames"
+    :type color
+    :group appearance
+    :depends use-custom-font-color
+    :after-set (lambda () (update-frame-font-color)))
+
 ;;; managing frame types
 
   (define (define-frame-type-mapper fun)
@@ -690,4 +711,5 @@ generate.")
 
   (sm-add-saved-properties 'ignored 'frame-style)
   (sm-add-restored-properties 'type)
-  (add-swapped-properties 'frame-active-color 'frame-inactive-color))
+  (add-swapped-properties 'frame-active-color 'frame-inactive-color)
+  )
diff --git a/lisp/sawfish/wm/user.jl b/lisp/sawfish/wm/user.jl
index 4dfe474..07dda68 100644
--- a/lisp/sawfish/wm/user.jl
+++ b/lisp/sawfish/wm/user.jl
@@ -119,7 +119,6 @@
     (init-apps-menu))
 
   ;; apply customized font-colors
-  (require 'sawfish.wm.extras)
   (if use-custom-font-color
       (update-frame-font-color))