GNOME.org
 

[sawfish/sawfish-1.5.0] truckload of backports from 1.6.0 (1.5.1 is near)

commit 0f522ff182824fb91b53970cbc77b13d629467f7
Author: chrisb <zanghar freenet de>
Date:   Tue Jul 28 16:23:28 2009 +0200

    truckload of backports from 1.6.0 (1.5.1 is near)

 ChangeLog                               |   25 +++++++++++++++++++++
 Makefile.in                             |    4 ++-
 config.h.in                             |    3 ++
 configure.in                            |   36 ++++++++++++++++--------------
 lisp/sawfish/gtk/widget.jl              |    2 +-
 lisp/sawfish/wm/ext/infinite-desktop.jl |    4 +-
 lisp/sawfish/wm/tabs/tab.jl             |   15 ++++++++----
 lisp/sawfish/wm/tabs/tabgroup.jl        |    2 +-
 lisp/sawfish/wm/util/marks.jl           |    2 +-
 man/news.texi                           |   35 ++++++++++++++++++++++++++++++
 po/Makefile.in                          |    4 +-
 sawfish-ksm.desktop                     |    6 +++++
 sawfish.desktop                         |    5 +---
 src/Makefile.in                         |    6 ++--
 14 files changed, 112 insertions(+), 37 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3d958cd..ea54fa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2009-07-28  Christopher Bratusek <zanghar freenet de>
+	* configure.in: bump version to 1.5.1 ("Great")
+	                small fixup in x11r7 checks regarding SMlib and libICE
+	                non-bash compatibility
+	
+	* lisp/sawfish/wm/tabs/tab.jl
+	* lisp/sawfish/wm/tabs/tabgroup.jl
+	* lisp/sawfish/wm/util/marks.jl: fixed license header	
+	
+	* po/Makefile.in: renamed realclean rule to distclean rule
+	
+	* lisp/sawfish/wm/placement/stagger.jl: fix group of stagger option
+	
+	* sawfish.desktop
+	* sawfish-wm.dektop: fixed a typo, removed unneeded entries
+	
+	* lisp/sawfish/wm/ext/infinite-desktop.jl: fixed cursor warping [Jeremy Hankins]
+	
+	* lisp/sawfish/gtk/widget.jl: connect spinbuttons to value-changed signal (allows typing in the value manually)
+	
+	* src/Makefile.in: add --tag=CC there necessary on some systems [Gentoo]
+	                   include $CFLAGS in gtk-style rule
+
+	* sawfish-ksm.desktop: make sawfish appear in the KDE4 Windowselector
+
 2009-07-02  Christopher Bratusek <zanghar freenet de>
 	* po/*
 	* configure.in: de-intltoolize sawfish ... is breaking current
diff --git a/Makefile.in b/Makefile.in
index 7c3aa9d..ac6db77 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,6 +59,7 @@ install : all installdirs
 	done
 	$(INSTALL_DATA) $(top_srcdir)/sawfish.pc $(DESTDIR)$(libdir)/pkgconfig/
 	$(INSTALL_DATA) $(top_srcdir)/sawfish-session.desktop $(DESTDIR)$(datadir)/xsessions/sawfish.desktop
+	$(INSTALL_DATA) $(top_srcdir)/sawfish-ksm.desktop $(DESTDIR)$(datadir)/apps/ksmserver/windowmanagers/sawfish.desktop
 
 installdirs : mkinstalldirs
 	$(SHELL) $< $(DESTDIR)$(sawfishdir)/$(version) \
@@ -66,7 +67,8 @@ installdirs : mkinstalldirs
 	  $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties \
 	  $(DESTDIR)$(datadir)/applications/ \
 	  $(DESTDIR)$(libdir)/pkgconfig/ \
-	  $(DESTDIR)$(datadir)/xsessions/
+	  $(DESTDIR)$(datadir)/xsessions/ \
+	  $(DESTDIR)$(datadir)/apps/ksmserver/windowmanagers/
 
 uninstall :
 	for dir in $(SUBDIRS); do \
diff --git a/config.h.in b/config.h.in
index d4a601c..4125686 100644
--- a/config.h.in
+++ b/config.h.in
@@ -147,6 +147,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff --git a/configure.in b/configure.in
index 9c0b02f..9dcdd39 100644
--- a/configure.in
+++ b/configure.in
@@ -29,9 +29,9 @@ AM_PROG_LIBTOOL
 #IT_PROG_INTLTOOL([0.40.0])
 
 dnl Release versioning info
-version="1.5.0"
+version="1.5.1"
 subversion=""
-codename="The Hardstyle Factory"
+codename="Great"
 
 VERSION=${version}
 
@@ -84,18 +84,18 @@ XFT_CFLAGS=""
 PKG_CHECK_MODULES(libXineRama, xinerama >= 1.0
 		  ,XINERAMA_LIBS="-lXinerama"
 		  AC_DEFINE(HAVE_X11_EXTENSIONS_XINERAMA_H, 1, [Have xinerama])
-		  ,AC_MSG_ERROR([can not locate libXineRama]))
+		  ,AC_MSG_ERROR([cannot locate libXineRama]))
 
 PKG_CHECK_MODULES(libXRandR, xrandr >= 1.0
 		  ,XRANDR_LIBS="-lXrandr"
 		  AC_DEFINE(HAVE_X11_EXTENSIONS_XRANDR_H, 1, [Have xrandr])
-		  ,AC_MSG_ERROR([can not locate libXRandR]))
+		  ,AC_MSG_ERROR([cannot locate libXRandR]))
 
 PKG_CHECK_MODULES(libXft, xft >= 1.0
 		  ,XFT_LIBS="-lXft"
 		  XFT_CFLAGS="`pkg-config --cflags xft`"
 		  AC_DEFINE(HAVE_X11_XFT_XFT_H, 1, [Have xft])
-		  ,AC_MSG_ERROR([can not locate libXft]))
+		  ,AC_MSG_ERROR([cannot locate libXft]))
 
 dnl is X available?
 X_LIBS=""
@@ -105,7 +105,7 @@ PKG_CHECK_MODULES(libX11, x11 >= 1.0
 		  X_LIBS="`pkg-config --libs x11`"
 		  X_CFLAGS="`pkg-config --cflags x11`"
 		  AC_DEFINE(X_DISPLAY_MISSING, 0, [Have x11])
-		  ,AC_MSG_ERROR([can not locate libX11]))
+		  ,AC_MSG_ERROR([cannot locate libX11]))
 
 X_LIBS="${X_LIBS} -lXext -lXrender"
 
@@ -113,11 +113,13 @@ 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_DEFINE(HAVE_X11_ICE_ICE_H, 1, [Have libice])
+		  ,AC_MSG_ERROR([cannot 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([cannot locate libSM]))
 
 X_SERVER="X.Org X11R7"
 
@@ -185,7 +187,7 @@ PANGO_MODULES="pango "
 
 PKG_CHECK_MODULES(PANGO, pango >= ${PANGO_MIN_VER}
 		  ,AC_DEFINE(HAVE_PANGO, 1, [Have pango]) FONT_LOADER="Pango"
-		  ,AC_MSG_ERROR([can not locate pango]))
+		  ,AC_MSG_ERROR([cannot locate pango]))
 
 PKG_CHECK_MODULES(PANGOX, pangox >= ${PANGO_MIN_VER}
 		  ,AC_DEFINE(HAVE_PANGO_X, 1, [Have pangox]) PANGO_MODULES="${PANGO_MODULES} pangox" FONT_LOADER="Pango X"
@@ -210,14 +212,14 @@ PKG_CHECK_MODULES(LIBREP, librep >= ${REP_MIN_VER}
 		  REP_LIBS="`pkg-config --libs librep`"
 		  REP_MSGFMT="`which msgfmt`"
 		  REP_VERSION="`pkg-config --variable=version librep`"
-		  ,AC_MSG_ERROR([can not locate librep]))
+		  ,AC_MSG_ERROR([cannot locate librep]))
 
 dnl Check for rep-gtk
 REP_GTK_MIN_VER="0.18.4"
 
 PKG_CHECK_MODULES(REP_GTK, rep-gtk >= ${REP_GTK_MIN_VER}
 		  ,
-		  ,AC_MSG_ERROR([can not locate rep-gtk]))
+		  ,AC_MSG_ERROR([cannot locate rep-gtk]))
 
 dnl Check for GTK+2
 GTK_MIN_VER="2.6.0"
@@ -226,7 +228,7 @@ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= ${GTK_MIN_VER}
 		  ,GTK_LIBS="`pkg-config --libs gtk+-2.0`"
 		  GTK_CFLAGS="`pkg-config --cflags gtk+-2.0`"
 		  AC_DEFINE(HAVE_GTK, 1, [Have GTK])
-		  ,AC_MSG_ERROR([can not locate gtk+2]))
+		  ,AC_MSG_ERROR([cannot locate gtk+2]))
 
 dnl Check for image handling libraries
 AC_ARG_WITH(gdk-pixbuf,
@@ -243,7 +245,7 @@ if test "$with_gdk_pixbuf" != "no"; then
 			  IMAGE_CFLAGS='${GDK_PIXBUF_CFLAGS}'
 			  IMAGE_LOADER="GDK Pixbuf Xlib"
 			  with_gdk_pixbuf=yes
-			  ,AC_MSG_ERROR([can not locate gdk-pixbuf-xlib])
+			  ,AC_MSG_ERROR([cannot locate gdk-pixbuf-xlib])
 			  with_gdk_pixbuf=no)
 fi
 
@@ -256,7 +258,7 @@ if test "$with_gdk_pixbuf" = "no"; then
 			  IMAGE_CFLAGS='${IMLIB1_CFLAGS}'
 			  IMLIB_VERSION="`pkg-config --modversion imlib`"
 			  IMAGE_LOADER="IMLIB 1"
-			  ,AC_MSG_ERROR([can not locate imlib1 library]))
+			  ,AC_MSG_ERROR([cannot locate imlib1 library]))
 fi
 
 dnl Check for libaudiofile
@@ -271,7 +273,7 @@ if test "$with_audiofile" = "yes"; then
 		      ,AUDIOFILE_LIBS="`pkg-config --libs audiofile`"
 		      AUDIOFILE_CFLAGS="`pkg-config --cflags audiofile`"
 		      AC_DEFINE(HAVE_LIBAUDIOFILE, 1, [Have libaudiofile])
-		      ,AC_MSG_ERROR([can not locate libaudiofile]))
+		      ,AC_MSG_ERROR([cannot locate libaudiofile]))
 fi
 
 dnl Check for esound
@@ -286,7 +288,7 @@ if test "$with_esd" = "yes"; then
 		      ,ESD_LIBS="`pkg-config --libs esound`"
 		      ESD_CFLAGS="`pkg-config --cflags esound`"
 		      AC_DEFINE(HAVE_ESD, 1, [Have ESD])
-		      ,AC_MSG_ERROR([can not locate esound]))
+		      ,AC_MSG_ERROR([cannot locate esound]))
 fi
 
 dnl Check wether to install mo files
@@ -296,7 +298,7 @@ AC_ARG_WITH(nls,
 	    --without-nls], [], [with_nls=yes])
 
 if test "$with_nls" = "yes"; then
-	SUBDIRS+=" po"
+	SUBDIRS="${SUBDIRS} po"
 fi
 
 dnl Check for Doug Lea's malloc in libc
diff --git a/lisp/sawfish/gtk/widget.jl b/lisp/sawfish/gtk/widget.jl
index c897caf..41128c1 100644
--- a/lisp/sawfish/gtk/widget.jl
+++ b/lisp/sawfish/gtk/widget.jl
@@ -273,7 +273,7 @@
 						  (or maximum 65535) 1)))
       (when changed-callback
 	(g-signal-connect
-	 widget "changed" (make-signal-callback changed-callback)))
+	 widget "value-changed" (make-signal-callback changed-callback)))
       (gtk-widget-show widget)
       (lambda (op)
 	(case op
diff --git a/lisp/sawfish/wm/ext/infinite-desktop.jl b/lisp/sawfish/wm/ext/infinite-desktop.jl
index d97d9d8..549a557 100644
--- a/lisp/sawfish/wm/ext/infinite-desktop.jl
+++ b/lisp/sawfish/wm/ext/infinite-desktop.jl
@@ -91,7 +91,7 @@
 	     (< (+ viewport-x-offset dist) minx))
 	(setq dist (- minx viewport-x-offset)))
     (set-viewport (+ viewport-x-offset dist) viewport-y-offset)
-    (move-cursor (max dist cdist) 0)))
+    (move-cursor (- (max dist cdist)) 0)))
 
 (define (infinite-desktop.move-top)
   (let ((dist (- infinite-desktop.move-distance))
@@ -102,7 +102,7 @@
 	     (< (+ viewport-y-offset dist) miny))
 	(setq dist (- miny viewport-y-offset)))
     (set-viewport viewport-x-offset (+ viewport-y-offset dist))
-    (move-cursor 0 (max dist cdist))))
+    (move-cursor 0 (- (max dist cdist)))))
 
 (define (infinite-desktop.move-bottom)
   (let ((dist infinite-desktop.move-distance)
diff --git a/lisp/sawfish/wm/tabs/tab.jl b/lisp/sawfish/wm/tabs/tab.jl
index 1687216..84d02c4 100644
--- a/lisp/sawfish/wm/tabs/tab.jl
+++ b/lisp/sawfish/wm/tabs/tab.jl
@@ -8,7 +8,7 @@
 
    This script is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    sawfish is distributed in the hope that it will be useful, but
@@ -67,7 +67,8 @@
   (defcustom tab-raise-on-hover nil 
     "Raise Tabs on Hover"
     :group tabs
-    :type boolean)
+    :type boolean
+    :after-set (lambda () (raise-tabs-on-hover-setter)))
 
   (define (get-tab-pos win)
     (let* ((group (tab-find-window win))
@@ -137,9 +138,13 @@
 
   (define-command 'tab-add-to-group mygroup #:spec "%W")
 
-  (if (eq tab-raise-on-hover 't)
-    (add-hook 'enter-frame-part-hook
-      (lambda (win) (raise-window win)))))
+  (define (raise-tabs-on-hover-action win)
+    (raise-window win))
+
+  (define (raise-tabs-on-hover-setter)
+    (if (eq tab-raise-on-hover 't)
+      (add-hook 'enter-frame-part-hook raise-tabs-on-hover-action)
+      (remove-hook 'enter-frame-part-hook raise-tabs-on-hover-action))))
 
   ;(require 'x-cycle)
   ;(define-cycle-command-pair
diff --git a/lisp/sawfish/wm/tabs/tabgroup.jl b/lisp/sawfish/wm/tabs/tabgroup.jl
index 2aba8ca..7e85531 100644
--- a/lisp/sawfish/wm/tabs/tabgroup.jl
+++ b/lisp/sawfish/wm/tabs/tabgroup.jl
@@ -8,7 +8,7 @@
 
    This script is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
+   the Free Software Foundation; either version 22, or (at your option)
    any later version.
 
    sawfish is distributed in the hope that it will be useful, but
diff --git a/lisp/sawfish/wm/util/marks.jl b/lisp/sawfish/wm/util/marks.jl
index 2b9ba43..250c794 100644
--- a/lisp/sawfish/wm/util/marks.jl
+++ b/lisp/sawfish/wm/util/marks.jl
@@ -8,7 +8,7 @@
 
    This script is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3, or (at your option)
+   the Free Software Foundation; either version 2, or (at your option)
    any later version.
 
    sawfish is distributed in the hope that it will be useful, but
diff --git a/man/news.texi b/man/news.texi
index 7091daf..8ac822d 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -6,6 +6,41 @@ This lists the user-visible changes made to Sawfish, and which releases
 they occurred between. For more detailed information see the
 @file{ChangeLog} file in the Sawfish source tree.
 
+ heading 1.5.1
+
+ itemize @bullet
+
+ item The 1.5.1 release has backports from 1.6.0 (HEAD)
+
+ item Bugs fixed:
+ itemize @minus
+
+ item Fix in SMlib check on x11r7 [Christopher Bratusek]
+
+ item Fix in libICE 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]
+
+ item Fixed group of the stagger options [Christopher Bratusek]
+ end itemize
+
+ item Other changes:
+ itemize @minus
+
+ item Sawfish does now appear in KDE4s WM Selector [Christopher Bratusek]
+
+ item Fixed typos in the .desktop files and removed unneded entries [Christopher Bratusek]
+
+ item Changing raise-tabs-on-hover takes effect immediately now [Christopher Bratusek]
+
+ item Add --tag=CC to libtool where necessary, unbrakes compilation on some arches [Gentoo]
+
+ item Distclean rule for po/Makefile.in [Christopher Bratusek]
+ end itemize
+ end itemize
+
 @heading 1.5.0
 
 @itemize @bullet
diff --git a/po/Makefile.in b/po/Makefile.in
index 9372e56..ada5719 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -81,7 +81,7 @@ uninstall :
 clean :
 	rm -f core *~ *.mo
 
-realclean : clean
+distclean : clean
 	rm -f Makefile $(PACKAGE).pot
 
-.PHONY : all install uninstall clean realclean
+.PHONY : all install uninstall clean distclean
diff --git a/sawfish-ksm.desktop b/sawfish-ksm.desktop
new file mode 100644
index 0000000..4ef44f7
--- /dev/null
+++ b/sawfish-ksm.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Sawfish
+Exec=sawfish
+TryExec=sawfish
+X-KDE-WindowManagerConfigure=sawfish-ui
+#X-KDE-WindowManagerRestartArgument=--replace
diff --git a/sawfish.desktop b/sawfish.desktop
index d730ce0..b132f19 100644
--- a/sawfish.desktop
+++ b/sawfish.desktop
@@ -9,10 +9,7 @@ TryExec=sawfish
 Terminal=false
 NoDisplay=true
 
-X-GNOME_WMName=Sawfish
+X-GNOME-WMName=Sawfish
 X-GNOME-Autostart-Phase=WindowManager
 X-GNOME-Provides=windowmanager
 X-GNOME-Autostart-Notify=true
-
-[Window Manager]
-SessionManaged=true
diff --git a/src/Makefile.in b/src/Makefile.in
index de4cc5c..4644b83 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -43,7 +43,7 @@ override CFLAGS := $(CFLAGS) $(REP_CFLAGS) $(IMAGE_CFLAGS) $(X11_CFLAGS) $(ESD_C
 all : sawfish libclient.o $(DL_OBJS) .libexec gtk-style
 
 sawfish : $(OBJS) $(LIBOBJS)
-	$(rep_LIBTOOL) --mode=link $(CC) -export-dynamic $(LDFLAGS) \
+	$(rep_LIBTOOL) --mode=link --tag=CC $(CC) -export-dynamic $(LDFLAGS) \
 	  -o sawfish $(OBJS) $(LIBOBJS) $(REP_LIBS) $(PANGO_LIBS) \
 	  $(IMAGE_LIBS) $(X11_LIBS) $(EXTRA_X11_LIBS) $(LIBS)
 
@@ -54,13 +54,13 @@ play-sample.la : play-sample.lo
 	$(rep_DL_LD) $(LDFLAGS) -o $@ $< $(ESD_LIBS) $(AUDIOFILE_LIBS)
 
 libclient_.lo : libclient.c
-	$(rep_LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
+	$(rep_LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 client.la : client.lo libclient_.lo
 	$(rep_DL_LD) $(LDFLAGS) -o $@ $^ $(X11_LIBS) $(REP_LIBS) $(LIBS)
 
 gtk-style : gtk-style.c
-	$(CC) $(CPPFLAGS) $(GTK_CFLAGS) $(LDFLAGS) -o $@ $< $(GTK_LIBS) $(LIBS)
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(GTK_CFLAGS) $(LDFLAGS) -o $@ $< $(GTK_LIBS) $(LIBS)
 
 install : all installdirs
 	for p in sawfish; do \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]