Re: Title switch with icon

[Teika Kazura <teika lavabit com>]

Use the attached patch, which reverts my recent commit.

Chris, could you revert 452d34d5df577f9ffa832ba6e9997017a5332efc ?
----------
commit 452d34d5df577f9ffa832ba6e9997017a5332efc
Author: Teika kazura <teika lavabit com>
Date:   Tue Jan 18 12:46:05 2011 +0900

    Simplified accesses to the module sawfish.wm.tabs.tab.
----------

I thought it was ok to move "require" in theme.jl to wm.jl, but not.
Since theme.jl is in gaol, it loads and evaluates each time.

Regards,
Teika (Teika kazura)

commit fd3a6b3ebe522c608167e77d7913abb274a71cb1
Author: Teika kazura <teika lavabit com>
Date:   Mon Jan 24 17:30:49 2011 +0900

    Revert "Simplified accesses to the module sawfish.wm.tabs.tab."
    
    It was wrong, and attempted profit was marginal, even if it were ok.
    This reverts commit 452d34d5df577f9ffa832ba6e9997017a5332efc.

diff --git a/lisp/sawfish/wm.jl b/lisp/sawfish/wm.jl
index c2390af..9c0046c 100644
--- a/lisp/sawfish/wm.jl
+++ b/lisp/sawfish/wm.jl
@@ -87,8 +87,7 @@
 			 sawfish.wm.state.iconify
 			 sawfish.wm.state.ignored
 			 sawfish.wm.server
-			 sawfish.wm.state.wm-spec
-			 sawfish.wm.tabs.tab))
+			 sawfish.wm.state.wm-spec))
 
 ;; Create the exports from sawfish.wm; Bindings in these modules are
 ;; exported by sawfish.wm on behalf of them. User scripts have to
diff --git a/lisp/sawfish/wm/gaol.jl b/lisp/sawfish/wm/gaol.jl
index 731ed98..daad892 100644
--- a/lisp/sawfish/wm/gaol.jl
+++ b/lisp/sawfish/wm/gaol.jl
@@ -71,6 +71,7 @@
 				sawfish.wm.util.gradient
 				sawfish.wm.util.recolor-image
 				sawfish.wm.theming.make-theme
+				sawfish.wm.tabs.tab
 				;; compatibility
 				timers gradient make-theme))
 
diff --git a/themes/DarkTab/theme.jl b/themes/DarkTab/theme.jl
index f2c75b4..ad5016d 100644
--- a/themes/DarkTab/theme.jl
+++ b/themes/DarkTab/theme.jl
@@ -2923,6 +2923,7 @@
            (right-frame-transient-buttons-right
             (make-button-list t darktab:right-top-buttons 'top-edge 0 (+ darktab:title-dimension darktab:button-width))))
 
+      (require 'sawfish.wm.tabs.tab)
       (when (eq current-title 'top)
         (let ((top-left-d-w 11)
               (top-right-d-w 3)
diff --git a/themes/Elberg-tabbed/theme.jl b/themes/Elberg-tabbed/theme.jl
index cc238a6..bee03e3 100644
--- a/themes/Elberg-tabbed/theme.jl
+++ b/themes/Elberg-tabbed/theme.jl
@@ -472,6 +472,7 @@
           (Elberg-rigth-m 16)
           (Elberg-left-m-t 0)
           (Elberg-right-m-t 0))
+      (require 'sawfish.wm.tabs.tab)
       (set-tab-adjustments #:theme-left-dec-width Elberg-left-d-w #:theme-right-dec-width Elberg-right-d-w #:theme-left-margin 
                            Elberg-left-m #:theme-right-margin Elberg-rigth-m #:theme-left-margin-transient Elberg-left-m-t 
                            #:theme-right-margin-transient Elberg-right-m-t))))
diff --git a/themes/get-S-tabbed/theme.jl b/themes/get-S-tabbed/theme.jl
index 2fb466c..4f2c166 100644
--- a/themes/get-S-tabbed/theme.jl
+++ b/themes/get-S-tabbed/theme.jl
@@ -311,6 +311,7 @@
           (rigth-m 38)
           (left-m-t 0)
           (right-m-t 0))
+      (require 'sawfish.wm.tabs.tab)
       (set-tab-adjustments #:theme-left-dec-width left-d-w #:theme-right-dec-width right-d-w #:theme-left-margin left-m #:theme-right-margin rigth-m
                            #:theme-left-margin-transient left-m-t #:theme-right-margin-transient right-m-t))))