[sawfish] Fix in SessionManagementlib check on x11r7 -- Make sure docks/panels are unframed -- Make sure windo

[Christopher Bratusek <chrisb src gnome org>]

commit af463d55a6f7325222bf7b8d47d2cdf8085f5a70
Author: chrisb <zanghar freenet de>
Date:   Tue Jul 28 15:02:54 2009 +0200

    Fix in SessionManagementlib check on x11r7 -- Make sure docks/panels are unframed -- Make sure window-type of docks/panels is dock

 ChangeLog                  |    7 +++++++
 configure.in               |    5 +++--
 lisp/sawfish/wm/frames.jl  |    2 +-
 lisp/sawfish/wm/windows.jl |    1 +
 man/news.texi              |    6 ++++++
 5 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 6163ad1..b77afbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-28  Christopher Bratusek <zanghar freenet de>
+	* lisp/sawfish/wm/frames.jl: make doc-windows unframed [Timo Korvola]
+
+	* lisp/sawfish/wm/windows.jl: set window-type to dock for panels [Timo Korvola]
+
+	* configure.in: small fixup in x11r7 checks regarding SessionManagementlib (SMlib)
+
 2009-07-27  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/wm/viewport.jl: Added viewport-boundary-mode dynamic [Jeremy Hankins]
 
diff --git a/configure.in b/configure.in
index 02969ff..002fe44 100644
--- a/configure.in
+++ b/configure.in
@@ -113,11 +113,12 @@ X_EXTRA_LIBS=""
 
 PKG_CHECK_MODULES(libICE, ice >= 1.0
 		  ,X_EXTRA_LIBS="${X_EXTRA_LIBS} -lICE"
-		  ,AC_MSG_ERROR([can't locate libICE]))
+		  ,AC_MSG_ERROR([can not locate libICE]))
 
 PKG_CHECK_MODULES(libSM, sm >= 1.0
 		  ,X_EXTRA_LIBS="${X_EXTRA_LIBS} -lSM"
-		  ,AC_MSG_ERROR([can't locate libSM]))
+		  AC_DEFINE(HAVE_X11_SM_SMLIB_H, 1, [Have smlib])
+		  ,AC_MSG_ERROR([can not locate libSM]))
 
 X_SERVER="X.Org X11R7"
 
diff --git a/lisp/sawfish/wm/frames.jl b/lisp/sawfish/wm/frames.jl
index d79e69f..1dc6cd4 100644
--- a/lisp/sawfish/wm/frames.jl
+++ b/lisp/sawfish/wm/frames.jl
@@ -151,7 +151,7 @@ that overrides settings set elsewhere.")
       (shaded . shaped)
       (shaded-transient . shaped-transient)
       (icon . shaped-transient)
-      (dock . icon)
+      (dock . unframed)
       (utility . default)
       (shaded-utility . shaded-transient)
       (toolbar . unframed)
diff --git a/lisp/sawfish/wm/windows.jl b/lisp/sawfish/wm/windows.jl
index df69be9..7bea112 100644
--- a/lisp/sawfish/wm/windows.jl
+++ b/lisp/sawfish/wm/windows.jl
@@ -188,6 +188,7 @@ then be the numeric id of its parent window."
     (window-put w 'dock-type t)
     (mapc (lambda (p)
 	    (window-put w p t)) dock-window-properties)
+    (set-window-type w 'dock)
     (set-window-depth w dock-window-depth))
 
   (define (window-in-cycle-p w #!key ignore-cycle-skip)
diff --git a/man/news.texi b/man/news.texi
index 494b1f0..ed501c1 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -23,6 +23,8 @@ they occurred between. For more detailed information see the
 @item Bugs fixed:
 @itemize @minus
 
+ item Fix in SessionManagementlib check on x11r7 [Christopher Bratusek]
+
 @item SpinButtons in Sawfish-UI are now connected to correct singal (allows typing in the value manually) [Christoper Bratusek]
 
 @item Fix cursor warping in Infinite-Desktop [Jeremy Hankins]
@@ -57,6 +59,10 @@ they occurred between. For more detailed information see the
 @item Other Changes:
 @itemize @minus
 
+ item Make sure docks/panels are unframed [Timo Korvola]
+
+ item Make sure window-type of docks/panels is dock [Timo Korvola]
+
 @item Sawfish-Ui does now allow negative values in SpinButtons by default [Christopher Bratusek]
 
 @item Sawfish does now appear in KDE4s WM Selector [Christopher Bratusek]