[PATCHES] Please test them

[Christopher Roy Bratusek <zanghar freenet de>]

Hi all,

two cleanup patches (librep 0.90.0/sawfish 1.5.0)

please test if everything is correct, until now I didn't find any
glitch (at first x-cycle did not correctly did messages on it
display-message, but then I found out that this was caused by
xcompmgr_hack which died while sawfish-restart, another restart fixed
that (just for the record))

The cleanup for librep with -Wall would then be complete.

But there's a XWdindow changes; which may be used uninitialized and
user.jl and misc.jl are saying that error-handler-functions is
undeclared then compiling them ... I'm somehow puzzled, as I don't see
the point.

Could somebody have a look at that, would be great!

Thanks for reading,
Chris

diff --git a/ChangeLog b/ChangeLog
index 47c2edc..290fecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-07  Christopher Bratusek <zanghar freenet de>
+	* src/unix_processes
+	* src/sdbm.c
+	* src/sdbm_pair.c: removed 3 unused variables
+
 2009-05-30  Christopher Bratusek <zanghar freenet de>
 	* src/utf8.c: added UTF-8 Support! [Wang Diancheng]
 
diff --git a/src/sdbm.c b/src/sdbm.c
index 187435b..bb79429 100644
--- a/src/sdbm.c
+++ b/src/sdbm.c
@@ -7,10 +7,6 @@
  * core routines
  */
 
-#ifndef lint
-static char rcsid[] = "$Id$";
-#endif
-
 #include "sdbm.h"
 #include "sdbm_tune.h"
 #include "sdbm_pair.h"
diff --git a/src/sdbm_pair.c b/src/sdbm_pair.c
index 361f4f4..39a1d4c 100644
--- a/src/sdbm_pair.c
+++ b/src/sdbm_pair.c
@@ -7,10 +7,6 @@
  * page-level routines
  */
 
-#ifndef lint
-static char rcsid[] = "$Id$";
-#endif
-
 #include "sdbm.h"
 #include "sdbm_tune.h"
 #include "sdbm_pair.h"
diff --git a/src/unix_processes.c b/src/unix_processes.c
index 0d396c0..659dc27 100644
--- a/src/unix_processes.c
+++ b/src/unix_processes.c
@@ -472,7 +472,6 @@ static int
 get_pty(char *slavenam)
 {
 #if defined(HAVE_PTYS)
-    char c;
     int master;
 
 # if defined(HAVE_DEV_PTMX) && defined(HAVE_GRANTPT)

diff --git a/ChangeLog b/ChangeLog
index 186c688..215fd04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-07  Christopher Bratusek <zanghar freenet de>
+	* src/flippers.c: removed an unused function
+
+	* lisp/sawfish/wm/gnome/integration.jl
+	* lisp/sawfish/wm/state/maximize.jl
+	* lisp/sawfish/wm/theming/make-theme.jl
+	* lisp/sawfish/wm/util/prompt.jl: removed serveral unused arguements 
+
 2009-06-01  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/gtk/widget.jl: UTF-8 Support
 
diff --git a/lisp/sawfish/wm/gnome/integration.jl b/lisp/sawfish/wm/gnome/integration.jl
index 16a7511..b8cb70b 100644
--- a/lisp/sawfish/wm/gnome/integration.jl
+++ b/lisp/sawfish/wm/gnome/integration.jl
@@ -34,8 +34,7 @@
 
   ;; delete the `Restart' and `Quit' items from the root menu
   (let ((restart (rassoc '(restart) root-menu))
-	(quit (rassoc '(quit) root-menu))
-	(programs (rassoc 'apps-menu root-menu)))
+	(quit (rassoc '(quit) root-menu)))
     (when restart
       (setq root-menu (delq restart root-menu)))
     (when quit
diff --git a/lisp/sawfish/wm/state/maximize.jl b/lisp/sawfish/wm/state/maximize.jl
index 394abcf..97b5527 100644
--- a/lisp/sawfish/wm/state/maximize.jl
+++ b/lisp/sawfish/wm/state/maximize.jl
@@ -523,7 +523,7 @@ unmaximized."
     "Fullscreen maximize the window across all Xinerama screens."
     (cond ((and state (not (window-maximized-fullscreen-p w)))
 	   (when (window-maximizable-p w)
-	     ( let ((screen-dims (screen-dimensions w)))
+	     ( let ((screen-dims (screen-dimensions)))
 	       (save-unmaximized-geometry w)
 	       (window-put w 'unmaximized-type (window-type w))
 	       (push-window-type w 'unframed 'sawfish.wm.state.maximize)
diff --git a/lisp/sawfish/wm/theming/make-theme.jl b/lisp/sawfish/wm/theming/make-theme.jl
index fc8acbe..15a24f5 100644
--- a/lisp/sawfish/wm/theming/make-theme.jl
+++ b/lisp/sawfish/wm/theming/make-theme.jl
@@ -50,7 +50,7 @@
 			   (setq value (get-color value)))
 			  ((and (consp value) (stringp (car value)))
 			   (let
-			       ((img (make-image (car value))))
+			       ((img (make-image)))
 			     (when img
 			       (mapc (lambda (attr)
 				       (cond
diff --git a/lisp/sawfish/wm/user.jl b/lisp/sawfish/wm/user.jl
index b889029..c5645a4 100644
--- a/lisp/sawfish/wm/user.jl
+++ b/lisp/sawfish/wm/user.jl
@@ -60,6 +60,7 @@
     (setq *user-module* (get-structure 'user)))
 
   (define (safe-load . args)
+    (require 'sawfish.wm.ext.error-handler)
     (condition-case data
 	(apply load args)
       (error
diff --git a/lisp/sawfish/wm/util/prompt.jl b/lisp/sawfish/wm/util/prompt.jl
index 994a1a0..45574d3 100644
--- a/lisp/sawfish/wm/util/prompt.jl
+++ b/lisp/sawfish/wm/util/prompt.jl
@@ -145,7 +145,7 @@ displayed. See the `display-message' function for more details.")
     "End input and accept current string."
     (let ((result (if (not prompt-validation-fun)
 		      prompt-result
-		    (prompt-validation-fun prompt-result))))
+		    (prompt-validation-fun))))
       (if result
 	  (progn
 	    (unless (or (null prompt-history)
@@ -263,7 +263,7 @@ displayed. See the `display-message' function for more details.")
       (when prompt-completion-fun
 	(let
 	    (compl)
-	  (setq prompt-completions (prompt-completion-fun prompt-result))
+	  (setq prompt-completions (prompt-completion-fun))
 	  (setq compl (complete-string prompt-result prompt-completions))
 	  (when compl
 	    (when (string= compl prompt-result)
@@ -290,14 +290,14 @@ displayed. See the `display-message' function for more details.")
 		(apply concat (mapcar (lambda (x)
 					(format nil "%s\n"
 						(if prompt-abbrev-fun
-						    (prompt-abbrev-fun x)
+						    (prompt-abbrev-fun)
 						  x)))
 				      compl))
 		continued))))
 
   (defun prompt-update-display ()
     (let ((result (if prompt-display-fun
-		      (prompt-display-fun prompt-result)
+		      (prompt-display-fun)
 		   prompt-result))
 	 (completions (prompt-format-completions)))
      (let
diff --git a/src/flippers.c b/src/flippers.c
index 9c5f9be..e43c715 100644
--- a/src/flippers.c
+++ b/src/flippers.c
@@ -64,21 +64,6 @@ flipper_to_sym (Window w)
 	return Qnil;
 }
 
-static Window
-sym_to_flipper (repv sym)
-{
-    if (sym == Qleft)
-	return edge_left;
-    else if (sym == Qright)
-	return edge_right;
-    else if (sym == Qtop)
-	return edge_top;
-    else if (sym == Qbottom)
-	return edge_bottom;
-    else
-	return 0;
-}
-
 static void
 event_handler (XEvent *ev)
 {