[sawfish] renamed sawfish-ui to sawfish-config -- justify grab-button and lables to left in match-window ui

From: Christopher Bratusek <chrisb src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [sawfish] renamed sawfish-ui to sawfish-config -- justify grab-button and lables to left in match-window ui
Date: Sat, 26 Sep 2009 15:59:48 +0000 (UTC)
commit 5143182eb9ca35977b400565f58feca19ef1ac6f
Author: chrisb <zanghar freenet de>
Date:   Sat Sep 26 17:58:44 2009 +0200

    renamed sawfish-ui to sawfish-config -- justify grab-button and lables to left in match-window ui

 CONTRIBUTING                                       |    2 +-
 ChangeLog                                          |   48 ++++++++++++++++----
 OPTIONS                                            |    6 +-
 README.IMPORTANT                                   |    6 +-
 TODO                                               |    6 +-
 configure.in                                       |    2 +-
 lisp/Makefile.in                                   |    2 +-
 lisp/sawfish/{ui => cfg}/Makefile.in               |   18 ++++----
 lisp/sawfish/{ui => cfg}/README                    |    0
 lisp/sawfish/{ui => cfg}/WIDGETS-LIST              |    0
 lisp/sawfish/{ui => cfg}/WISHLIST                  |    2 +-
 lisp/sawfish/{ui => cfg}/apply.jl                  |    8 ++--
 lisp/sawfish/{ui => cfg}/config.jl                 |    8 ++--
 lisp/sawfish/{ui => cfg}/group.jl                  |    6 +-
 lisp/sawfish/{ui => cfg}/i18n.jl                   |    4 +-
 lisp/sawfish/{ui => cfg}/layout.jl                 |    6 +-
 lisp/sawfish/{ui => cfg}/layouts/keymaps.jl        |    8 ++--
 lisp/sawfish/{ui => cfg}/main.jl.in                |   10 ++--
 lisp/sawfish/{ui => cfg}/monitor.png               |  Bin 1177 -> 1177 bytes
 lisp/sawfish/{ui => cfg}/shell.jl                  |   12 +++---
 lisp/sawfish/{ui => cfg}/slot.jl                   |    4 +-
 lisp/sawfish/{ui => cfg}/widgets/command.jl        |    4 +-
 lisp/sawfish/{ui => cfg}/widgets/event.jl          |    4 +-
 lisp/sawfish/{ui => cfg}/widgets/frame-style.jl    |    4 +-
 lisp/sawfish/{ui => cfg}/widgets/gtk/README        |    0
 lisp/sawfish/{ui => cfg}/widgets/gtk/icon.jl       |    2 +-
 .../{ui => cfg}/widgets/gtk/workspace-geometry.jl  |    2 +-
 lisp/sawfish/{ui => cfg}/widgets/icon.jl           |    2 +-
 lisp/sawfish/{ui => cfg}/widgets/keymap.jl         |    2 +-
 lisp/sawfish/{ui => cfg}/widgets/match-window.jl   |   12 +++---
 lisp/sawfish/{ui => cfg}/widgets/modifier-list.jl  |    2 +-
 .../{ui => cfg}/widgets/workspace-geometry.jl      |    2 +-
 lisp/sawfish/{ui => cfg}/wm.jl                     |    2 +-
 lisp/sawfish/wm/customize.jl                       |    2 +-
 lisp/sawfish/wm/ext/match-window.jl                |    2 +-
 man/news.texi                                      |    4 +-
 man/{sawfish-ui.1 => sawfish-config.1}             |    8 ++--
 man/sawfish.texi                                   |    2 +-
 po/POTFILES.in                                     |   20 ++++----
 sawfish-ksm.desktop                                |    2 +-
 sawfish-wm.desktop                                 |    4 +-
 sawfish.ebuild.in                                  |    2 +-
 sawfish.spec.in                                    |    4 +-
 themes/mxflat/CHANGELOG                            |    2 +-
 themes/mxflat/README                               |    6 +-
 themes/mxflat/TODO                                 |    2 +-
 themes/mxflat/theme.jl                             |    4 +-
 47 files changed, 146 insertions(+), 114 deletions(-)
---
diff --git a/CONTRIBUTING b/CONTRIBUTING
index b15322c..2899ffd 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -72,7 +72,7 @@ Christopher Bratusek (Maintainer since Dec 2008)
 ************************************************
 (A..Z)
 
- - Alexey I. Froloff for sawfish-ui bugfix
+ - Alexey I. Froloff for sawfish-config bugfix
  - Andrea Vettorello for a lot of wok on wiki and several patches
  - Christopher Bratusek for numerous patches & cleanup and other active contribution
  - Dagfinn I. Mannsake for enter-click focus mode patch and xterm command patch
diff --git a/ChangeLog b/ChangeLog
index e5c6502..9930a82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,38 @@
 2009-09-26  Christopher Bratusek <zanghar freenet de>
+	* lisp/Makefile.in
+	* lisp/sawfish/cfg/Makefile.in
+	* configure.in
+	* man/sawfish-ui.1
+	* man/sawfish-config.1
+	* lisp/sawfish/ui/
+	* lisp/sawfish/cfg/: renamed `sawfish-ui' to `sawfish-config'
+
+	* OPTIONS
+	* README.IMPORTANT
+	* TODO
+	* lisp/sawfish/wm/custom.jl
+	* lisp/sawfish/wm/ext/match-window.jl
+	* sawfish.ebuild.in
+	* sawfish.spec.in
+	* sawfish-ksm.desktop
+	* sawfish-wm.desktop
+	* themes/mxflat/theme.jl
+	* themes/mxflat/CHANGELOG
+	* themes/mxflat/README
+	* themes/mxflat/TODO
+	* CONTRIBUTING
+	* man/sawfish.texi
+	* man/news.texi: updated
+
+	* lisp/sawfish/cfg/widgets/match-window.jl: justify the `grab' button to the left
+	                                            justify the labels to the left
+
 	* KEYBINDINGS: explained macros (artist formerly known as `nested keybindings')
 	               added Multikey (aka Compose)
 		       better explaination of ISO_Level3_Shift
 
+	* po/make-pot: removed --update (intltool + rep = puke)
+
 2009-09-23  Christopher Bratusek <zanghar freenet de>
 	* man/news.texi: news items for 1.6.0 are partially rewritten [Teika Kazura]
 
@@ -79,7 +109,7 @@
 
 	* man/sawfish.1
 	* man/sawfish-client.1
-	* man/sawfish-ui.1: added man-page for sawfish 
+	* man/sawfish-ui.1: added man-page for sawfish
 	                 added man-page for sawfish-client
 			 added man-page for sawfish-ui
 			 -- [Debian]
@@ -112,7 +142,7 @@
 	* lisp/sawfish/wm/focus.jl: doc for focus-revert
 	                            indention improvements
 				    -- [Teika Kazura]
-	
+
 	* man/news.texi: major rewrite of 1.5.0 section [Teika Kazura]
 	                 updated
 
@@ -185,7 +215,7 @@
 	* lisp/sawfish/wm/theming/make-theme.jl: make-image is defined the *second* time here
 	                                         the first time in gaol, rename this instance to
 						 make-image-possibly-from-cache to avoid confusion
-						 for both users and the rep-compiler 
+						 for both users and the rep-compiler
 						 also squashes a compiler warning [Matthew Love]
 
 	* src/play-sample.c
@@ -308,7 +338,7 @@
 	* lisp/sawfish/wm/commands/user.jl: ex sawfish.wm.commands.xterm
 	                                    `browser' command added (defaults to `www-broser')
 					    `some' statement added () [Mark Triggs]
-					    `display-message-with-timeout' function added 
+					    `display-message-with-timeout' function added
 					    `program-available' function added [Mark Triggs]
 					    `view-clipboard' command [Mark Triggs]
 
@@ -337,7 +367,7 @@
 	* lisp/sawfish/wm/autoload.jl: unify entry syntax
 
 	* lisp/sawfish/wm/gaol.jl: make default-directory safe-special
-	
+
 	* lisp/sawfish/wm/commands/move-resize.jl: added halve/double-window-size functions
 						   added resize-by-factor meta functions
 
@@ -379,7 +409,7 @@
 
 	* lisp/sawfish/wm/commands/shrink-yank.jl: export commands
 
-	* lisp/sawfish/wm/workspace.jl: export send-to-workspace 
+	* lisp/sawfish/wm/workspace.jl: export send-to-workspace
 	                                fix a select-workspace-from-first call [Michal Maruska]
 
 	* configure.in: bump minimum librep to 0.90.2, to make sure folks get a fixed sawfish-ui regarding UTF8 strings
@@ -389,7 +419,7 @@
 	* lisp/sawfish/wm/match-window.jl: set default to 0 if unset previously (avoids -65355 as default)
 
 2009-08-09  Christopher Bratusek <zanghar freenet de>
-	* lisp/sawfish/wm/ext/match-window.jl: move rename-window here, as it requires prompt but this either does not 
+	* lisp/sawfish/wm/ext/match-window.jl: move rename-window here, as it requires prompt but this either does not
 	                                       load properly in windows.jl or breaks sawfish-ui if require'ed instead of open'ed
 
 	* KEYBINDINGS: Added desckription of several keys
@@ -409,7 +439,7 @@
 
 2009-07-29  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/wm/mmc/window-manipulation.jl: moved maximize-unframe/reframe into sawfish.wm.state.maximize
-	                                              moved rename-window into sawfish.wm.windows 
+	                                              moved rename-window into sawfish.wm.windows
 
 	* lisp/sawfish/wm/windows.jl: first change WM_NAME then _NET_WM_NAME in rename-window (so that we can grab
 	                              the new window-name with sawfish-ui and display it in the titlebar (some panels,
@@ -645,7 +675,7 @@
 	* man/news.texi: removed dupped entries, fixed typos
 
 	* sounds/Makefile.in
-	* po/Makefile.in	
+	* po/Makefile.in
 	* src/Makefile.in: fix uninstall target
 
 	* Makefile.in: uninstall all .desktop files
diff --git a/OPTIONS b/OPTIONS
index 16ac992..3fa3a56 100644
--- a/OPTIONS
+++ b/OPTIONS
@@ -40,10 +40,10 @@
 
 ;; customization options
 
-;;   From sawfish-1.5.0, sawfish-ui does use a treeview by default.
+;;   From sawfish-1.5.0, sawfish-config does use a treeview by default.
 ;;   If you prefer the previous notebook-style instead use:
-;;   "sawfish-ui --flatten"
-;;  (define-special-variable customize-program "sawfish-ui"
+;;   "sawfish-config --flatten"
+;;  (define-special-variable customize-program "sawfish-config"
 ;;    "Command name of the configurator GUI.")
 
 ;;  (define-special-variable customize-group-opt "--group")
diff --git a/README.IMPORTANT b/README.IMPORTANT
index 4799544..1146934 100644
--- a/README.IMPORTANT
+++ b/README.IMPORTANT
@@ -56,7 +56,7 @@ simply add the following flag to configure:
 
 (eg: ./configure --prefix=/usr --without-nls)
 
-Sawfish-UI GtkTree:
+SawfishConfig GtkTree:
 *******************
 
 recently the old GtkNotebook UI has been replaced by a GtkTree
@@ -65,7 +65,7 @@ it, so you need to double-click it.
 
 but: the old ui is -of course- still available, use:
 
-sawfish-ui --flatten [in a terminal]
-(define-special-variable customize-program "sawfish-ui --flatten") [in your config-file]
+sawfish-config --flatten [in a terminal]
+(define-special-variable customize-program "sawfish-config --flatten") [in your config-file]
 
 - Christopher Bratusek <zanghar freenet de>
diff --git a/TODO b/TODO
index dd510dd..ca5f0d5 100644
--- a/TODO
+++ b/TODO
@@ -34,7 +34,7 @@ Outstanding bugs
 
   ! uses a really kludgey method of getting command documentation
 
-  ! need better error handling in sawfish-ui (e.g. values that don't
+  ! need better error handling in sawfish-config (e.g. values that don't
     match widget types)
 
   ! workspace names don't change as workspaces are added/deleted
@@ -240,8 +240,8 @@ Window manager tasks
     (didn't NeWS allow this kind of thing, must do research..)
 
 
-ui tasks
+config tasks
 ========
 
-see lisp/sawfish/ui/WISHLIST
+see lisp/sawfish/cfg/WISHLIST
 
diff --git a/configure.in b/configure.in
index 21ec92d..f405ab1 100644
--- a/configure.in
+++ b/configure.in
@@ -430,7 +430,7 @@ sawfish.ebuild
 sawfish.pc
 sawfish.spec
 lisp/Makefile
-lisp/sawfish/ui/Makefile
+lisp/sawfish/cfg/Makefile
 lisp/sawfish/gtk/Makefile
 lisp/sawfish/gtk/widgets/font.jl
 man/Makefile
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 1caac28..481ec0d 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -38,7 +38,7 @@ SAWFISH_LISP_DIRS := sawfish/wm
 
 INSTALL_FILES := *.jl *.jlc
 
-SUBDIRS := sawfish/gtk sawfish/ui
+SUBDIRS := sawfish/gtk sawfish/cfg
 
 INSTALL_DIRS := \
 	sawfish sawfish/wm sawfish/wm/ext \
diff --git a/lisp/sawfish/ui/Makefile.in b/lisp/sawfish/cfg/Makefile.in
similarity index 83%
rename from lisp/sawfish/ui/Makefile.in
rename to lisp/sawfish/cfg/Makefile.in
index 5d4af92..dc96228 100644
--- a/lisp/sawfish/ui/Makefile.in
+++ b/lisp/sawfish/cfg/Makefile.in
@@ -69,26 +69,26 @@ all : $(ALL_SRCS) $(ALL_OBJS)
 
 install : all installdirs
 	set -e; for p in $(SRCS) $(OBJS); do \
-	  $(INSTALL_DATA) $$p $(DESTDIR)${lispdir}/sawfish/ui; \
+	  $(INSTALL_DATA) $$p $(DESTDIR)${lispdir}/sawfish/cfg; \
 	done
 	set -e; for p in $(W_SRCS) $(W_OBJS); do \
-	  $(INSTALL_DATA) $$p $(DESTDIR)${lispdir}/sawfish/ui/widgets; \
+	  $(INSTALL_DATA) $$p $(DESTDIR)${lispdir}/sawfish/cfg/widgets; \
 	done
 	set -e; for p in $(L_SRCS) $(L_OBJS); do \
-	  $(INSTALL_DATA) $$p $(DESTDIR)${lispdir}/sawfish/ui/layouts; \
+	  $(INSTALL_DATA) $$p $(DESTDIR)${lispdir}/sawfish/cfg/layouts; \
 	done
 	$(INSTALL_DATA) monitor.png $(DESTDIR)${lispdir}/..
-	$(INSTALL_SCRIPT) main.jlc $(DESTDIR)${bindir}/sawfish-ui
+	$(INSTALL_SCRIPT) main.jlc $(DESTDIR)${bindir}/sawfish-config
 
 uninstall :
-	rm -rf $(DESTDIR)${lispdir}/sawfish/ui
+	rm -rf $(DESTDIR)${lispdir}/sawfish/cfg
 	rm -f $(DESTDIR)${lispdir}/../monitor.png
-	rm -f $(DESTDIR)${bindir}/sawfish-ui
+	rm -f $(DESTDIR)${bindir}/sawfish-config
 
 installdirs : $(top_srcdir)/mkinstalldirs
-	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(lispdir)/sawfish/ui \
-	  $(DESTDIR)$(lispdir)/sawfish/ui/widgets \
-	  $(DESTDIR)$(lispdir)/sawfish/ui/layouts $(DESTDIR)$(bindir)
+	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(lispdir)/sawfish/cfg \
+	  $(DESTDIR)$(lispdir)/sawfish/cfg/widgets \
+	  $(DESTDIR)$(lispdir)/sawfish/cfg/layouts $(DESTDIR)$(bindir)
 
 clean : 
 	rm -f *.jlc *~ core
diff --git a/lisp/sawfish/ui/README b/lisp/sawfish/cfg/README
similarity index 100%
rename from lisp/sawfish/ui/README
rename to lisp/sawfish/cfg/README
diff --git a/lisp/sawfish/ui/WIDGETS-LIST b/lisp/sawfish/cfg/WIDGETS-LIST
similarity index 100%
rename from lisp/sawfish/ui/WIDGETS-LIST
rename to lisp/sawfish/cfg/WIDGETS-LIST
diff --git a/lisp/sawfish/ui/WISHLIST b/lisp/sawfish/cfg/WISHLIST
similarity index 96%
rename from lisp/sawfish/ui/WISHLIST
rename to lisp/sawfish/cfg/WISHLIST
index bcac4f9..9b31dd7 100644
--- a/lisp/sawfish/ui/WISHLIST
+++ b/lisp/sawfish/cfg/WISHLIST
@@ -66,7 +66,7 @@ Items that have been committed:
 
   + nautilus-like ``user levels'' controlling when options get enabled
 
-  + rewrite sawfish-ui to use ``items'' as in sawfish-themer (complex
+  + rewrite sawfish-config to use ``items'' as in sawfish-themer (complex
     widgets represented by functional data types). This would allow
     more complex custom types, i.e. `(or number string)' etc...
 
diff --git a/lisp/sawfish/ui/apply.jl b/lisp/sawfish/cfg/apply.jl
similarity index 97%
rename from lisp/sawfish/ui/apply.jl
rename to lisp/sawfish/cfg/apply.jl
index 0070bbf..0ac52a4 100644
--- a/lisp/sawfish/ui/apply.jl
+++ b/lisp/sawfish/cfg/apply.jl
@@ -21,7 +21,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.apply
+(define-structure sawfish.cfg.apply
 
     (export define-change-handler
 	    apply-slot-changes
@@ -35,9 +35,9 @@
 	  gui.gtk-2.gtk
 	  sawfish.gtk.widget
 	  sawfish.gtk.stock
-	  sawfish.ui.slot
-	  sawfish.ui.group
-	  sawfish.ui.wm)
+	  sawfish.cfg.slot
+	  sawfish.cfg.group
+	  sawfish.cfg.wm)
 
   ;; list of slots that have changed since last apply
   (define changed-slots '())
diff --git a/lisp/sawfish/ui/config.jl b/lisp/sawfish/cfg/config.jl
similarity index 94%
rename from lisp/sawfish/ui/config.jl
rename to lisp/sawfish/cfg/config.jl
index bbc6b7c..eec68eb 100644
--- a/lisp/sawfish/ui/config.jl
+++ b/lisp/sawfish/cfg/config.jl
@@ -21,16 +21,16 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.config
+(define-structure sawfish.cfg.config
 
     (export define-config-item
 	    initialize-configs)
 
     (open rep
 	  rep.data.tables
-	  sawfish.ui.apply
-	  sawfish.ui.slot
-	  sawfish.ui.group)
+	  sawfish.cfg.apply
+	  sawfish.cfg.slot
+	  sawfish.cfg.group)
 
   (define done-init nil)
 
diff --git a/lisp/sawfish/ui/group.jl b/lisp/sawfish/cfg/group.jl
similarity index 99%
rename from lisp/sawfish/ui/group.jl
rename to lisp/sawfish/cfg/group.jl
index e34f312..4d2bec3 100644
--- a/lisp/sawfish/ui/group.jl
+++ b/lisp/sawfish/cfg/group.jl
@@ -21,7 +21,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.group
+(define-structure sawfish.cfg.group
 
     (export group-real-name
 	    group-slots
@@ -44,8 +44,8 @@
 	  rep.system
 	  rep.data.records
 	  rep.data.tables
-	  sawfish.ui.slot
-	  sawfish.ui.wm)
+	  sawfish.cfg.slot
+	  sawfish.cfg.wm)
 
   (define-record-type :group
     (make-group name)
diff --git a/lisp/sawfish/ui/i18n.jl b/lisp/sawfish/cfg/i18n.jl
similarity index 97%
rename from lisp/sawfish/ui/i18n.jl
rename to lisp/sawfish/cfg/i18n.jl
index ddefcd7..2502c3b 100644
--- a/lisp/sawfish/ui/i18n.jl
+++ b/lisp/sawfish/cfg/i18n.jl
@@ -21,7 +21,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.i18n
+(define-structure sawfish.cfg.i18n
 
     (export i18n-lang
 	    i18n-filename
@@ -32,7 +32,7 @@
 	  rep.regexp
 	  rep.io.files
 	  rep.i18n.gettext
-	  sawfish.ui.wm)
+	  sawfish.cfg.wm)
 
   (define i18n-lang (or (getenv "LC_ALL")
 			(getenv "LC_MESSAGES")
diff --git a/lisp/sawfish/ui/layout.jl b/lisp/sawfish/cfg/layout.jl
similarity index 97%
rename from lisp/sawfish/ui/layout.jl
rename to lisp/sawfish/cfg/layout.jl
index fea1e1a..bea75cb 100644
--- a/lisp/sawfish/ui/layout.jl
+++ b/lisp/sawfish/cfg/layout.jl
@@ -21,7 +21,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.layout
+(define-structure sawfish.cfg.layout
 
     (export define-layout-type
 	    layout-slots
@@ -32,7 +32,7 @@
     ((open rep
 	   gui.gtk-2.gtk
 	   rep.regexp
-	   sawfish.ui.slot
+	   sawfish.cfg.slot
 	   sawfish.gtk.widget)
      (access rep.structures))
 
@@ -45,7 +45,7 @@
   (define (layout-type name)
     (or (get name 'nokogiri-layout)
 	;; try to dynamically load it
-	(let ((module-name (intern (concat "sawfish.ui.layouts."
+	(let ((module-name (intern (concat "sawfish.cfg.layouts."
 					   (symbol-name name)))))
 	  (condition-case nil
 	      (progn
diff --git a/lisp/sawfish/ui/layouts/keymaps.jl b/lisp/sawfish/cfg/layouts/keymaps.jl
similarity index 96%
rename from lisp/sawfish/ui/layouts/keymaps.jl
rename to lisp/sawfish/cfg/layouts/keymaps.jl
index 9da2c48..f9f9b15 100644
--- a/lisp/sawfish/ui/layouts/keymaps.jl
+++ b/lisp/sawfish/cfg/layouts/keymaps.jl
@@ -21,14 +21,14 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.layouts.keymaps ()
+(define-structure sawfish.cfg.layouts.keymaps ()
 
     (open rep
 	  gui.gtk-2.gtk
 	  rep.regexp
-	  sawfish.ui.slot
-	  sawfish.ui.wm
-	  sawfish.ui.layout
+	  sawfish.cfg.slot
+	  sawfish.cfg.wm
+	  sawfish.cfg.layout
 	  sawfish.gtk.widget)
 
   (define label-ptr nil)
diff --git a/lisp/sawfish/ui/main.jl.in b/lisp/sawfish/cfg/main.jl.in
similarity index 93%
rename from lisp/sawfish/ui/main.jl.in
rename to lisp/sawfish/cfg/main.jl.in
index a46620f..a6b117a 100644
--- a/lisp/sawfish/ui/main.jl.in
+++ b/lisp/sawfish/cfg/main.jl.in
@@ -38,15 +38,15 @@ exec rep "$0" "$@"
 	  rep.system
 	  rep.io.streams
 	  sawfish.gtk.widget
-	  sawfish.ui.i18n
-	  sawfish.ui.shell
-	  sawfish.ui.group)
+	  sawfish.cfg.i18n
+	  sawfish.cfg.shell
+	  sawfish.cfg.group)
 
   (define socket-id nil)
 
   (when (get-command-line-option "--help")
     (write standard-output "\
-usage: sawfish-ui [OPTIONS...]\n
+usage: sawfish-cfg [OPTIONS...]\n
 where OPTIONS are any of:\n
   --group=GROUP-NAME
   --flatten
@@ -71,7 +71,7 @@ where OPTIONS are any of:\n
 
   (setq interrupt-mode 'exit)
   (i18n-init)
-  (add-widget-prefix 'sawfish.ui.widgets)
+  (add-widget-prefix 'sawfish.cfg.widgets)
   (run-shell socket-id))
 
 
diff --git a/lisp/sawfish/ui/monitor.png b/lisp/sawfish/cfg/monitor.png
similarity index 100%
rename from lisp/sawfish/ui/monitor.png
rename to lisp/sawfish/cfg/monitor.png
diff --git a/lisp/sawfish/ui/shell.jl b/lisp/sawfish/cfg/shell.jl
similarity index 98%
rename from lisp/sawfish/ui/shell.jl
rename to lisp/sawfish/cfg/shell.jl
index 01a1df9..842254e 100644
--- a/lisp/sawfish/ui/shell.jl
+++ b/lisp/sawfish/cfg/shell.jl
@@ -21,7 +21,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.shell
+(define-structure sawfish.cfg.shell
 
     (export initialize-shell
 	    destroy-shell
@@ -35,11 +35,11 @@
 	  rep.io.timers
 	  sawfish.gtk.stock
 	  sawfish.gtk.widget
-	  sawfish.ui.group
-	  sawfish.ui.slot
-	  sawfish.ui.apply
-	  sawfish.ui.layout
-	  sawfish.ui.config)
+	  sawfish.cfg.group
+	  sawfish.cfg.slot
+	  sawfish.cfg.apply
+	  sawfish.cfg.layout
+	  sawfish.cfg.config)
 
   (defvar *nokogiri-flatten-groups* nil)
   (defvar *nokogiri-single-level* nil)
diff --git a/lisp/sawfish/ui/slot.jl b/lisp/sawfish/cfg/slot.jl
similarity index 98%
rename from lisp/sawfish/ui/slot.jl
rename to lisp/sawfish/cfg/slot.jl
index 76d972d..ed00673 100644
--- a/lisp/sawfish/ui/slot.jl
+++ b/lisp/sawfish/cfg/slot.jl
@@ -21,7 +21,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.slot
+(define-structure sawfish.cfg.slot
 
     (export slot-name
 	    slot-widget
@@ -42,7 +42,7 @@
 	  rep.data.tables
 	  rep.data.records
 	  sawfish.gtk.widget
-	  sawfish.ui.wm)
+	  sawfish.cfg.wm)
 
   (define-record-type :slot
     (create-slot name old-value flags)
diff --git a/lisp/sawfish/ui/widgets/command.jl b/lisp/sawfish/cfg/widgets/command.jl
similarity index 98%
rename from lisp/sawfish/ui/widgets/command.jl
rename to lisp/sawfish/cfg/widgets/command.jl
index 4340ef4..10018ab 100644
--- a/lisp/sawfish/ui/widgets/command.jl
+++ b/lisp/sawfish/cfg/widgets/command.jl
@@ -21,13 +21,13 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.widgets.command ()
+(define-structure sawfish.cfg.widgets.command ()
 
     (open rep
 	  gui.gtk-2.gtk
 	  rep.regexp
 	  sawfish.gtk.widget
-	  sawfish.ui.wm)
+	  sawfish.cfg.wm)
 
   (define all-commands)
 
diff --git a/lisp/sawfish/ui/widgets/event.jl b/lisp/sawfish/cfg/widgets/event.jl
similarity index 96%
rename from lisp/sawfish/ui/widgets/event.jl
rename to lisp/sawfish/cfg/widgets/event.jl
index 2bb9035..8464f84 100644
--- a/lisp/sawfish/ui/widgets/event.jl
+++ b/lisp/sawfish/cfg/widgets/event.jl
@@ -21,13 +21,13 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.widgets.event ()
+(define-structure sawfish.cfg.widgets.event ()
 
     (open rep
 	  rep.regexp
 	  gui.gtk-2.gtk
 	  sawfish.gtk.widget
-	  sawfish.ui.wm)
+	  sawfish.cfg.wm)
 
   (define (make-event-item changed)
 
diff --git a/lisp/sawfish/ui/widgets/frame-style.jl b/lisp/sawfish/cfg/widgets/frame-style.jl
similarity index 98%
rename from lisp/sawfish/ui/widgets/frame-style.jl
rename to lisp/sawfish/cfg/widgets/frame-style.jl
index df8c4ea..d68bb09 100644
--- a/lisp/sawfish/ui/widgets/frame-style.jl
+++ b/lisp/sawfish/cfg/widgets/frame-style.jl
@@ -21,7 +21,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.widgets.frame-style ()
+(define-structure sawfish.cfg.widgets.frame-style ()
 
     (open rep
 	  gui.gtk-2.gtk
@@ -29,7 +29,7 @@
 	  rep.io.files
 	  rep.io.timers
 	  sawfish.gtk.widget
-	  sawfish.ui.i18n)
+	  sawfish.cfg.i18n)
 
   (define (make-frame-style-item changed-callback doc options path)
 
diff --git a/lisp/sawfish/ui/widgets/gtk/README b/lisp/sawfish/cfg/widgets/gtk/README
similarity index 100%
rename from lisp/sawfish/ui/widgets/gtk/README
rename to lisp/sawfish/cfg/widgets/gtk/README
diff --git a/lisp/sawfish/ui/widgets/gtk/icon.jl b/lisp/sawfish/cfg/widgets/gtk/icon.jl
similarity index 95%
rename from lisp/sawfish/ui/widgets/gtk/icon.jl
rename to lisp/sawfish/cfg/widgets/gtk/icon.jl
index 72597d6..ee8d00c 100644
--- a/lisp/sawfish/ui/widgets/gtk/icon.jl
+++ b/lisp/sawfish/cfg/widgets/gtk/icon.jl
@@ -23,7 +23,7 @@
 
 ;; GNOME-less version of this widget
 
-(define-structure sawfish.ui.widgets.icon ()
+(define-structure sawfish.cfg.widgets.icon ()
 
     (open rep
 	  sawfish.gtk.widget)
diff --git a/lisp/sawfish/ui/widgets/gtk/workspace-geometry.jl b/lisp/sawfish/cfg/widgets/gtk/workspace-geometry.jl
similarity index 95%
rename from lisp/sawfish/ui/widgets/gtk/workspace-geometry.jl
rename to lisp/sawfish/cfg/widgets/gtk/workspace-geometry.jl
index 91a6da9..25d8a05 100644
--- a/lisp/sawfish/ui/widgets/gtk/workspace-geometry.jl
+++ b/lisp/sawfish/cfg/widgets/gtk/workspace-geometry.jl
@@ -23,7 +23,7 @@
 
 ;; GNOME-less version of this widget
 
-(define-structure sawfish.ui.widgets.workspace-geometry ()
+(define-structure sawfish.cfg.widgets.workspace-geometry ()
 
     (open rep
 	  sawfish.gtk.widget)
diff --git a/lisp/sawfish/ui/widgets/icon.jl b/lisp/sawfish/cfg/widgets/icon.jl
similarity index 95%
rename from lisp/sawfish/ui/widgets/icon.jl
rename to lisp/sawfish/cfg/widgets/icon.jl
index f789872..af6b08b 100644
--- a/lisp/sawfish/ui/widgets/icon.jl
+++ b/lisp/sawfish/cfg/widgets/icon.jl
@@ -23,7 +23,7 @@
 
 ;; GNOME-less version of this widget
 
-(define-structure sawfish.ui.widgets.icon ()
+(define-structure sawfish.cfg.widgets.icon ()
 
     (open rep
 	  sawfish.gtk.widget)
diff --git a/lisp/sawfish/ui/widgets/keymap.jl b/lisp/sawfish/cfg/widgets/keymap.jl
similarity index 98%
rename from lisp/sawfish/ui/widgets/keymap.jl
rename to lisp/sawfish/cfg/widgets/keymap.jl
index 423df27..6abee7f 100644
--- a/lisp/sawfish/ui/widgets/keymap.jl
+++ b/lisp/sawfish/cfg/widgets/keymap.jl
@@ -21,7 +21,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.widgets.keymap ()
+(define-structure sawfish.cfg.widgets.keymap ()
 
     (open rep
 	  gui.gtk-2.gtk
diff --git a/lisp/sawfish/ui/widgets/match-window.jl b/lisp/sawfish/cfg/widgets/match-window.jl
similarity index 96%
rename from lisp/sawfish/ui/widgets/match-window.jl
rename to lisp/sawfish/cfg/widgets/match-window.jl
index 364856b..d4669aa 100644
--- a/lisp/sawfish/ui/widgets/match-window.jl
+++ b/lisp/sawfish/cfg/widgets/match-window.jl
@@ -21,14 +21,14 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.widgets.match-window ()
+(define-structure sawfish.cfg.widgets.match-window ()
 
     (open rep
 	  gui.gtk-2.gtk
 	  rep.regexp
 	  sawfish.gtk.widget
 	  sawfish.gtk.stock
-	  sawfish.ui.wm)
+	  sawfish.cfg.wm)
 
   (defconst matcher-count 3)
 
@@ -53,9 +53,9 @@
 	      (button (gtk-button-new-with-label (_ "Grab..."))))
 	  (gtk-combo-set-popdown-strings
 	   combo (cons "" (mapcar cdr l10n-x-properties)))
-	  (gtk-table-attach-defaults table combo 0 1 i (1+ i))
-	  (gtk-table-attach-defaults table entry 1 2 i (1+ i))
-	  (gtk-table-attach-defaults table button 2 3 i (1+ i))
+	  (gtk-table-attach-defaults table button 0 1 i (1+ i))
+	  (gtk-table-attach-defaults table combo 1 2 i (1+ i))
+	  (gtk-table-attach-defaults table entry 2 3 i (1+ i))
 	  (g-signal-connect button "clicked"
 	   (lambda ()
 	     (let* ((string (gtk-entry-get-text (gtk-combo-entry combo)))
@@ -176,7 +176,7 @@
 
   (define (make-left-label string)
     (let ((hbox (gtk-hbox-new nil 0)))
-      (gtk-box-pack-end hbox (gtk-label-new string))
+      (gtk-box-pack-start hbox (gtk-label-new string))
       hbox))
   
   ;; also in sawfish-xgettext
diff --git a/lisp/sawfish/ui/widgets/modifier-list.jl b/lisp/sawfish/cfg/widgets/modifier-list.jl
similarity index 97%
rename from lisp/sawfish/ui/widgets/modifier-list.jl
rename to lisp/sawfish/cfg/widgets/modifier-list.jl
index 74142ce..6b58bc5 100644
--- a/lisp/sawfish/ui/widgets/modifier-list.jl
+++ b/lisp/sawfish/cfg/widgets/modifier-list.jl
@@ -23,7 +23,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.widgets.modifier-list ()
+(define-structure sawfish.cfg.widgets.modifier-list ()
 
     (open rep
 	  rep.regexp
diff --git a/lisp/sawfish/ui/widgets/workspace-geometry.jl b/lisp/sawfish/cfg/widgets/workspace-geometry.jl
similarity index 95%
rename from lisp/sawfish/ui/widgets/workspace-geometry.jl
rename to lisp/sawfish/cfg/widgets/workspace-geometry.jl
index 2456dc8..2a522a8 100644
--- a/lisp/sawfish/ui/widgets/workspace-geometry.jl
+++ b/lisp/sawfish/cfg/widgets/workspace-geometry.jl
@@ -23,7 +23,7 @@
 
 ;; GNOME-less version of this widget
 
-(define-structure sawfish.ui.widgets.workspace-geometry ()
+(define-structure sawfish.cfg.widgets.workspace-geometry ()
 
     (open rep
 	  sawfish.gtk.widget)
diff --git a/lisp/sawfish/ui/wm.jl b/lisp/sawfish/cfg/wm.jl
similarity index 98%
rename from lisp/sawfish/ui/wm.jl
rename to lisp/sawfish/cfg/wm.jl
index 25ca3fe..110ff59 100644
--- a/lisp/sawfish/ui/wm.jl
+++ b/lisp/sawfish/cfg/wm.jl
@@ -21,7 +21,7 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-(define-structure sawfish.ui.wm
+(define-structure sawfish.cfg.wm
 
     (export wm-load-slots
 	    wm-load-group
diff --git a/lisp/sawfish/wm/customize.jl b/lisp/sawfish/wm/customize.jl
index 305d7ef..0018280 100644
--- a/lisp/sawfish/wm/customize.jl
+++ b/lisp/sawfish/wm/customize.jl
@@ -35,7 +35,7 @@
 
   (define-structure-alias customize sawfish.wm.customize)
 
-  (defvar customize-program "sawfish-ui"
+  (defvar customize-program "sawfish-config"
     "Command name of the configurator GUI.")
 
   (defvar customize-group-opt "--group")
diff --git a/lisp/sawfish/wm/ext/match-window.jl b/lisp/sawfish/wm/ext/match-window.jl
index e06894e..e3ded4a 100644
--- a/lisp/sawfish/wm/ext/match-window.jl
+++ b/lisp/sawfish/wm/ext/match-window.jl
@@ -161,7 +161,7 @@
     :group match-window
     :require sawfish.wm.ext.match-window)
 
-  ;; used by sawfish-ui when grabbing property values
+  ;; used by sawfish-config when grabbing property values
   (define (match-window-grab-x-property real-prop)
     (let ((window (select-window))
 	  prop)
diff --git a/man/news.texi b/man/news.texi
index 7364c2d..1e4cd84 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -30,7 +30,9 @@ beeing generated, if there's no customized apps-menu
 Sawfish will rename @code{~/.sawmillrc} to @code{~/.sawfishrc}, if the former does exist on
 your system, but the later doesn't
 
- item In Sawfish-UI the "Matched Windows" group has been renamed to "Windows Rules"
+ item @code{sawfish-ui} has been renamed to @code{sawfish-config}
+
+ item In SawfishConfig the "Matched Windows" group has been renamed to "Windows Rules"
 @end itemize
 
 @item Bugs fixed:
diff --git a/man/sawfish-ui.1 b/man/sawfish-config.1
similarity index 79%
rename from man/sawfish-ui.1
rename to man/sawfish-config.1
index d07c7ad..ed66607 100644
--- a/man/sawfish-ui.1
+++ b/man/sawfish-config.1
@@ -1,9 +1,9 @@
-.TH "sawfish-ui" "1" 
+.TH "sawfish-config" "1" 
 .SH "NAME" 
-sawfish-ui \(em The Sawfish Configurator. 
+sawfish-config \(em The Sawfish Configurator. 
 .SH "SYNOPSIS" 
 .PP 
-\fBsawfish-ui\fR [\fB \-\-group=\fIGROUP-NAME \fR\fP]  [\fB \-\-flatten \fP]  [\fB \-\-single-level \fP]  [\fB \-\-socket-id=\fIWINDOW-ID \fR\fP]  
+\fBsawfish-config\fR [\fB \-\-group=\fIGROUP-NAME \fR\fP]  [\fB \-\-flatten \fP]  [\fB \-\-single-level \fP]  [\fB \-\-socket-id=\fIWINDOW-ID \fR\fP]  
 .SH "DESCRIPTION" 
 .PP 
 This program can be used to invoke the GUI manually; if GNOME is being 
@@ -14,7 +14,7 @@ certain classes.
 Display only \fIGROUP-NAME\fR 
 .IP "" 10 
 \fIGROUP-NAME\fR should be one of these 
-names Sawfish, Appearance, Bindings, Focus, Matched Windows, 
+names Sawfish, Appearance, Bindings, Focus, Window Rules, 
 Minimizing/Maximizing, Miscellaneous, Move/Resize, Placement, Sounds, Workspaces 
 .IP "\fB\-\-flatten\fP" 10 
 display sub-groups inline instead of using a tree widget 
diff --git a/man/sawfish.texi b/man/sawfish.texi
index 37236e2..2b2d698 100644
--- a/man/sawfish.texi
+++ b/man/sawfish.texi
@@ -2838,7 +2838,7 @@ customization variables to configure, or all classes if @var{group} is
 undefined.
 @end deffn
 
-The @file{sawfish-ui} program can be used to invoke the GUI manually;
+The @file{sawfish-config} program can be used to invoke the GUI manually;
 if GNOME is being used, then the GNOME Control Center can also be used
 to customize certain classes.
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8365287..26d613d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,16 +5,16 @@ lisp/sawfish/gtk/widgets/font.jl.in
 lisp/sawfish/gtk/widgets/list.jl
 lisp/sawfish/gtk/widgets/scheme-boolean.jl
 lisp/sawfish/gtk/widget.jl
-lisp/sawfish/ui/widgets/gtk/workspace-geometry.jl
-lisp/sawfish/ui/apply.jl
-lisp/sawfish/ui/shell.jl
-lisp/sawfish/ui/layouts/keymaps.jl
-lisp/sawfish/ui/widgets/command.jl
-lisp/sawfish/ui/widgets/event.jl
-lisp/sawfish/ui/widgets/icon.jl
-lisp/sawfish/ui/widgets/keymap.jl
-lisp/sawfish/ui/widgets/match-window.jl
-lisp/sawfish/ui/widgets/workspace-geometry.jl
+lisp/sawfish/cfg/widgets/gtk/workspace-geometry.jl
+lisp/sawfish/cfg/apply.jl
+lisp/sawfish/cfg/shell.jl
+lisp/sawfish/cfg/layouts/keymaps.jl
+lisp/sawfish/cfg/widgets/command.jl
+lisp/sawfish/cfg/widgets/event.jl
+lisp/sawfish/cfg/widgets/icon.jl
+lisp/sawfish/cfg/widgets/keymap.jl
+lisp/sawfish/cfg/widgets/match-window.jl
+lisp/sawfish/cfg/widgets/workspace-geometry.jl
 lisp/sawfish/wm/autoload.jl
 lisp/sawfish/wm/commands.jl
 lisp/sawfish/wm/commands/cycle.jl
diff --git a/sawfish-ksm.desktop b/sawfish-ksm.desktop
index 4ef44f7..f0dc794 100644
--- a/sawfish-ksm.desktop
+++ b/sawfish-ksm.desktop
@@ -2,5 +2,5 @@
 Name=Sawfish
 Exec=sawfish
 TryExec=sawfish
-X-KDE-WindowManagerConfigure=sawfish-ui
+X-KDE-WindowManagerConfigure=sawfish-config
 #X-KDE-WindowManagerRestartArgument=--replace
diff --git a/sawfish-wm.desktop b/sawfish-wm.desktop
index 5dab746..655fb90 100644
--- a/sawfish-wm.desktop
+++ b/sawfish-wm.desktop
@@ -8,8 +8,8 @@ TryExec=sawfish
 Terminal=false
 NoDisplay=true
 
-ConfigExec=sawfish-ui
-ConfigTryExec=sawfish-ui
+ConfigExec=sawfish-config
+ConfigTryExec=sawfish-config
 
 X-GNOME-WMName=Sawfish
 X-GNOME-Autostart-Notify=true
diff --git a/sawfish.ebuild.in b/sawfish.ebuild.in
index 5c2fdac..cef4265 100644
--- a/sawfish.ebuild.in
+++ b/sawfish.ebuild.in
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.3.ebuild,v 1.7 2008/10/06 17:13:50 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish- VERSION@.ebuild,v 1.7 2008/10/06 17:13:50 truedfx Exp $
 
 inherit eutils
 
diff --git a/sawfish.spec.in b/sawfish.spec.in
index 2493ce7..331246e 100644
--- a/sawfish.spec.in
+++ b/sawfish.spec.in
@@ -11,7 +11,6 @@ Packager: Christopher Bratusek <zanghar freenet de>
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gmp-devel texinfo
 Provides: windowmanager
-Obsoletes: sawmill sawmill-gnome sawfish-gnome sawfish-themer
 
 %description
 Sawfish is an extensible window manager which uses a Lisp-based
@@ -64,8 +63,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sawfish/%{version}
 %{_datadir}/gnome/wm-properties/sawfish-wm.desktop
 %{_datadir}/applications/sawfish.desktop
-%{_datadir}/apps/ksmserver/windowmanagers/sawfish.desktop
+ KDEDIR@/ksmserver/windowmanagers/sawfish.desktop
 %{_datadir}/xsessions/sawfish.desktop
+%{_datadir}/man/man1/sawfish*.gz
 %{_datadir}/pixmaps/sawfish*.png
 %{_libdir}/pkgconfig/sawfish.pc
 %{_libexecdir}/sawfish/%{version}/%{_host}
diff --git a/themes/mxflat/CHANGELOG b/themes/mxflat/CHANGELOG
index facfe7b..11a29de 100644
--- a/themes/mxflat/CHANGELOG
+++ b/themes/mxflat/CHANGELOG
@@ -58,7 +58,7 @@ v0.7.2 (ta)    2002-12-24
    is only taken into account on not-maximized windows
  -button3 click on the configure button toggles "custom-title" option
    button2 click toggles show-workspace-buttons option
-   (somehow that isn't shown in sawfish-ui, but it's there, believe me!)
+   (somehow that isn't shown in sawfish-config, but it's there, believe me!)
  -fixed a bug with the title x-alignment when the title of a window changes
 
 v0.7.1 (ta)    2002-12-12
diff --git a/themes/mxflat/README b/themes/mxflat/README
index 801a6dc..2d984d3 100644
--- a/themes/mxflat/README
+++ b/themes/mxflat/README
@@ -17,7 +17,7 @@ nothing
 you should really open ~/.sawfish/custom and delete the line
 containing "mxflat:button-position-model". besides the
 button position direction was changes, so you have to change
-all negative position values to positive ones in sawfish-ui or the 
+all negative position values to positive ones in sawfish-config or the 
 custom file. furthermore some config variable names have changes,
 so it might happen you have to readjust some options.
 
@@ -25,10 +25,10 @@ so it might happen you have to readjust some options.
 
 copy the 'mxflat' directory that you have extracted from the mxflat-*.tar.gz
 to you sawfish theme directory (~/.sawfish/themes or /usr/share/sawfish/themes).
-check the file-permissions, then start "sawfish-ui" and
+check the file-permissions, then start "sawfish-config" and
 choose "mxflat" as your default frame style.
 
-hint: it is recommended to use "sawfish-ui" and 
+hint: it is recommended to use "sawfish-config" and 
 not the gnome control-center to configure this theme.
 
 ### copyright ###
diff --git a/themes/mxflat/TODO b/themes/mxflat/TODO
index f74868c..01f2e30 100644
--- a/themes/mxflat/TODO
+++ b/themes/mxflat/TODO
@@ -21,7 +21,7 @@ known bugs/limitations
   too small for the gradient sawfish reports an error on console
   (i think this is because the gradient function tries to fill a 0x0 pixel image)
 
--with gnome2/sawfish-1.2 the options in sawfish-ui change on the fly but that is
+-with gnome2/sawfish-1.2 the options in sawfish-config change on the fly but that is
   sometimes really slow, improve speed
 
 -due to the newer update behaviour we have some problems with sawfish >=1.0
diff --git a/themes/mxflat/theme.jl b/themes/mxflat/theme.jl
index 7edf2db..e363081 100644
--- a/themes/mxflat/theme.jl
+++ b/themes/mxflat/theme.jl
@@ -884,7 +884,7 @@
 (defcustom mxflat:customize-configure-keymap
 	nil
 	"customize configure button keymap"
-	:tooltip "by default a button will work as it's name suggests. button1: start sawfish-ui - button3: toggle custom title string"
+	:tooltip "by default a button will work as it's name suggests. button1: start sawfish-config - button3: toggle custom title string"
 	:group (appearance mxflat:group mxflat:buttons-group mxflat:buttons-keymaps2-group)
 	:type boolean
 	:after-set recreate-all-frames
@@ -893,7 +893,7 @@
 (defcustom mxflat:configure-button-keymap
 	nil
 	nil
-	:tooltip "button1: start sawfish-ui - button3: toggle custom title string"
+	:tooltip "button1: start sawfish-config - button3: toggle custom title string"
 	:group (appearance mxflat:group mxflat:buttons-group mxflat:buttons-keymaps2-group)
 	:widget-flags (expand-horizontally)
 	:depends mxflat:customize-configure-keymap
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]