[sawfish] some changes, see ChangeLog

[Christopher Bratusek <chrisb src gnome org>]

commit c0565a86ad5e773e9f8d21623606c71fc309c195
Author: chrisb <zanghar freenet de>
Date:   Fri Jun 26 22:22:42 2009 +0200

    some changes, see ChangeLog

 ChangeLog                       |   18 ++++++++++++++++++
 README.IMPORTANT                |    9 +++++++++
 configure.in                    |   12 +++++++++++-
 lisp/Makefile.in                |    2 ++
 lisp/sawfish/gtk/Makefile.in    |    2 +-
 lisp/sawfish/gtk/widget.jl      |    2 +-
 lisp/sawfish/ui/Makefile.in     |    2 +-
 lisp/sawfish/wm/session/init.jl |    2 +-
 lisp/sawfish/wm/session/load.jl |    5 +++++
 man/news.texi                   |    6 ++++++
 10 files changed, 55 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6dca646..3e05df8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2009-06-26  Christopher Bratusek <zanghar freenet de>
+	* configure.in: added --with/without-nls option [disable installing
+	translations files, default=enabled]
+
+	* scripts/Makefile.in
+	* lisp/Makefile.in
+	* lisp/sawfish/ui/Makefile.in
+	* lisp/sawfish/gtk/Makefile.in: expand REP_ENVIRON
+
+	* lisp/sawfish/wm/session/init.jl: set RestartStyleHint to 2
+	[Christian Marillat]
+
+	* lisp/sawfish/wm/session/load.jl: when matching window to alist try
+	to match according WM_NAME if there's no WM_CLASS [Christian Marillat]
+
+	* README.IMPORTANT
+	* man/news.texi: updated
+
 2009-06-19  Christopher Bratusek <zanghar freenet de>
 	* themes/microGUI/theme.jl: fixed a speed-issue
 
diff --git a/README.IMPORTANT b/README.IMPORTANT
index 767bf94..42a381d 100644
--- a/README.IMPORTANT
+++ b/README.IMPORTANT
@@ -43,6 +43,15 @@ simply add the following flag to configure:
 
 (eg: ./configure --prefix=/usr --without-pango)
 
+Building without translations:
+******************************
+
+simply add the following flag to configure:
+
+--without-nls
+
+(eg: ./configure --prefix=/usr --without-nls)
+
 Sawfish-UI GtkTree:
 *******************
 
diff --git a/configure.in b/configure.in
index 49d9be8..68b1083 100644
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,7 @@ GETTEXT_PACKAGE=${PACKAGE}
 
 install_sh=../install-sh
 
-SUBDIRS="src lisp scripts themes sounds man po"
+SUBDIRS="src lisp scripts themes sounds man"
 
 sawfishdir='${datadir}/sawfish'
 lispdir='${sawfishdir}/${version}/lisp'
@@ -289,6 +289,16 @@ if test "$with_esd" = "yes"; then
 		      ,AC_MSG_ERROR([can not locate esound]))
 fi
 
+dnl Check wether to install mo files
+
+AC_ARG_WITH(nls,
+	   [ --with-nls		Install translations
+	    --without-nls], [], [with_nls=yes])
+
+if test "$with_nls" = "yes"; then
+	SUBDIRS+=" po"
+fi
+
 dnl Check for Doug Lea's malloc in libc
 doug_lea_malloc=yes
 AC_CHECK_FUNC(malloc_get_state, , doug_lea_malloc=no)
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index bfb3d8c..ea04649 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -25,6 +25,8 @@ top_builddir=..
 top_srcdir= top_srcdir@
 VPATH= srcdir@:@top_srcdir@
 
+REP_ENVIRON:=$(REP_ENVIRON) REP_LOAD_PATH=$(top_srcdir)/lisp:$(top_builddir)/lisp
+
 # also in themes/Makefile.in
 sawfish_prog = ../src/sawfish --batch --no-rc
 COMPILE_ENV = SAWFISHLISPDIR=. \
diff --git a/lisp/sawfish/gtk/Makefile.in b/lisp/sawfish/gtk/Makefile.in
index eb135db..b2db81e 100644
--- a/lisp/sawfish/gtk/Makefile.in
+++ b/lisp/sawfish/gtk/Makefile.in
@@ -27,7 +27,7 @@ top_srcdir= top_srcdir@
 srcdir= srcdir@
 VPATH= srcdir@:@top_srcdir@
 
-REP_ENVIRON:=$(REP_ENVIRON) REP_LOAD_PATH=$(top_srcdir)/lisp
+REP_ENVIRON:=$(REP_ENVIRON) REP_LOAD_PATH=$(top_srcdir)/lisp:$(top_builddir)/lisp
 
 SRCS :=	color-preview.jl	\
 	stock.jl		\
diff --git a/lisp/sawfish/gtk/widget.jl b/lisp/sawfish/gtk/widget.jl
index 3105b43..c897caf 100644
--- a/lisp/sawfish/gtk/widget.jl
+++ b/lisp/sawfish/gtk/widget.jl
@@ -436,7 +436,7 @@
     (let ((box (gtk-hbox-new nil box-spacing)))
       (setq item (make-widget item changed-callback))
       ;; XXX i18n the label string?
-      (gtk-box-pack-start box (gtk-label-new label))
+      (gtk-box-pack-start box (gtk-label-new (_ label)))
       (gtk-container-add box (widget-gtk-widget item))
       (gtk-widget-show-all box)
       (lambda (op)
diff --git a/lisp/sawfish/ui/Makefile.in b/lisp/sawfish/ui/Makefile.in
index fd5fe15..5d4af92 100644
--- a/lisp/sawfish/ui/Makefile.in
+++ b/lisp/sawfish/ui/Makefile.in
@@ -27,7 +27,7 @@ top_srcdir= top_srcdir@
 srcdir= srcdir@
 VPATH= srcdir@:@top_srcdir@
 
-REP_ENVIRON:=$(REP_ENVIRON) REP_LOAD_PATH=$(top_srcdir)/lisp
+REP_ENVIRON:=$(REP_ENVIRON) REP_LOAD_PATH=$(top_srcdir)/lisp:$(top_builddir)/lisp
 
 SRCS :=	apply.jl		\
 	config.jl		\
diff --git a/lisp/sawfish/wm/session/init.jl b/lisp/sawfish/wm/session/init.jl
index 6d335da..0f42f0e 100644
--- a/lisp/sawfish/wm/session/init.jl
+++ b/lisp/sawfish/wm/session/init.jl
@@ -176,7 +176,7 @@ that feature off, allowing some broken clients to be session managed.")
 
       ;; XXX should I set this to SmRestartImmediately (2) instead
       ;; XXX of SmRestartIfRunning (0) ?
-      (sm-set-property "RestartStyleHint" 0)
+      (sm-set-property "RestartStyleHint" 2)
 
       (remove-sm-options)
       (sm-set-property "CloneCommand" saved-command-line-args)
diff --git a/lisp/sawfish/wm/session/load.jl b/lisp/sawfish/wm/session/load.jl
index 7bf4ac9..433f737 100644
--- a/lisp/sawfish/wm/session/load.jl
+++ b/lisp/sawfish/wm/session/load.jl
@@ -71,6 +71,7 @@
     (let ((client-id (sm-get-window-prop w 'SM_CLIENT_ID))
 	  (role (nth 2 (get-x-property w 'WM_WINDOW_ROLE)))
 	  (class (sm-get-window-prop w 'WM_CLASS))
+	  (name (sm-get-window-prop w 'WM_NAME))
 	  (command (sm-get-window-prop w 'WM_COMMAND)))
       (catch 'out
 	(when (and (not sm-sloppy-id-matching)
@@ -97,6 +98,10 @@
 	  ;; no WM_WINDOW_ROLE, so try matching WM_CLASS
 	  (when (and class (cdr (assq 'class alist))
 		     (not (string= class (cdr (assq 'class alist)))))
+	      (throw 'out nil))
+	  ;; no WM_CLASS, so try matching WM_NAME
+	  (when (and name (cdr (assq 'name alist))
+		     (not (string= name (cdr (assq 'name alist)))))
 	    (throw 'out nil)))
 
 	;; XXX match on WM_NAME and WM_CLIENT_MACHINE..?
diff --git a/man/news.texi b/man/news.texi
index 9991ea7..a010e77 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -118,6 +118,12 @@ To use the old style, put @code{(define-special-variable customize-program "sawf
 
 @item To build without Pango add --without-pango flag [Christopher Bratusek]
 
+ item To prevent installing translations add --without-nls flag [Christopher Bratusek]
+
+ item Set RestartStyleHint to 2 [Christian Marillat]
+
+ item When matching window to alist try WM_NAME if WM_CLASS is unset [Christian Marillat]
+
 @item Major Documentation update [Derek Upham, Teika Kazura]
 
 @item New Sound Theme [glh Pimenta]