[sawfish] removed view-clipboard, display-message-with-timeout, display-ws-name, with all setters and defvars/

[Christopher Bratusek <chrisb src gnome org>]

commit f892ee0ae3d54270c985ed779560342842773b61
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Sat Nov 14 12:26:55 2009 +0100

    removed view-clipboard, display-message-with-timeout, display-ws-name, with all setters and defvars/defcustoms

 ChangeLog                        |    7 ++++++
 lisp/sawfish/wm/commands/user.jl |   41 ++-----------------------------------
 lisp/sawfish/wm/workspace.jl     |   29 --------------------------
 man/news.texi                    |    6 +----
 src/display.c                    |    4 +-
 5 files changed, 13 insertions(+), 74 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 41a4298..3f20e59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-14  Christopher Bratusek <zanghar freenet de>
+	* lisp/sawfish/wm/user.jl
+	* lisp/sawfish/wm/workspace.jl: removed display-message-with-timeout
+	                                        view-clipboard
+						display-ws-name
+						with all setters and defvars/defcustoms
+
 2009-11-14  Teika kazura <teika lavabit com>
 	* sawfish-client.jl: won't say "bye" at exit. The greeting "bye" annoys if you use emacs' sawfish-mode, so drop it.
 
diff --git a/lisp/sawfish/wm/commands/user.jl b/lisp/sawfish/wm/commands/user.jl
index d1e298c..0caf38a 100644
--- a/lisp/sawfish/wm/commands/user.jl
+++ b/lisp/sawfish/wm/commands/user.jl
@@ -21,9 +21,7 @@
 (define-structure sawfish.wm.commands.user
 
     (export xterm
-	    browser
-	    display-message-with-timeout
-	    view-clipboard)
+	    browser)
 
     (open rep
 	  rep.system
@@ -32,9 +30,7 @@
 	  rep.io.files
 	  sawfish.wm.misc
 	  sawfish.wm.custom
-	  sawfish.wm.commands
-	  sawfish.wm.workspace
-	  sawfish.wm.util.selection)
+	  sawfish.wm.commands)
 
   (defgroup apps "Default Applications" :group misc)
 
@@ -64,37 +60,6 @@
       (system (format nil "%s %s >/dev/null 2>&1 </dev/null &"
                       browser-program website))))
 
-  ;; display-message-with-timeout
-  ;; like display-message, but it dissapears
-  ;; after `timemout' seconds, displayed endlessly
-  ;; (like without timeout), if a negative value is given
-  (define (display-message-with-timeout message timeout)
-    (display-message message)
-    (make-timer (lambda () (display-message nil)) timeout))
-
-  (defcustom clipboard-preview-clip-length 60
-    "Maximum length of Clipboard Preview"
-    :type number
-    :group misc)
-
-  (defcustom clipboard-preview-timeout 5
-    "How long to display Clipboard Preview"
-    :type number
-    :group misc)
-
-  ;; view-clipboard
-  ;; view the content of the primary x-clipboard
-  (define (view-clipboard)
-    "Show the contents of the clipboard in a message window"
-    (let ((c (x-get-selection 'PRIMARY)))
-      (if (> (length c) 0)
-          (if (< (length c) clipboard-preview-clip-length)
-              (display-message-with-timeout c clipboard-preview-timeout)
-            (display-message-with-timeout
-             (format nil "%s ..." (substring c 0 clipboard-preview-clip-length))
-             clipboard-preview-timeout)))))
-
   ;;###autoload
   (define-command 'xterm xterm #:class 'default)
-  (define-command 'browser browser #:class 'default)
-  (define-command 'view-clipboard view-clipboard #:class 'default))
+  (define-command 'browser browser #:class 'default))
diff --git a/lisp/sawfish/wm/workspace.jl b/lisp/sawfish/wm/workspace.jl
index 807218a..b6b3777 100644
--- a/lisp/sawfish/wm/workspace.jl
+++ b/lisp/sawfish/wm/workspace.jl
@@ -101,8 +101,6 @@
 	    show-desktop
 	    hide-desktop
 	    showing-desktop-p
-	    display-workspace-name
-	    display-ws-name-setter
 
 	    ;; XXX rename these..?
 	    ws-remove-window
@@ -960,33 +958,6 @@ last instance remaining, then delete the actual window."
     (setq last-interesting-workspace nil)
     (call-hook 'workspace-state-change-hook))
 
-;;; Extras
-
-  (defcustom display-ws-name-on-switch nil
-    "Whether to display workspace name upon switch"
-    :type boolean
-    :group workspace
-    :after-set (lambda () (display-ws-name-setter)))
-
-  (defcustom display-ws-name-timeout 3
-    "How long to display workspace name"
-    :type number
-    :group workspace)
-
-  ;; display-workspace-name
-  ;; display WS name on switch
-  (define (display-workspace-name)
-    (display-message-with-timeout
-     (format nil "Now on Workspace: %s"
-             (or (nth current-workspace workspace-names)
-                 (format nil (_ "Workspace %d") (1+ current-workspace))))
-     display-ws-name-timeout))
-
-  (define (display-ws-name-setter)
-    (if (eq display-ws-name-on-switch 't)
-        (add-hook 'enter-workspace-hook display-workspace-name)
-      (remove-hook 'enter-workspace-hook display-workspace-name)))
-
   (define-command 'display-workspace-name display-workspace-name
     #:class 'default)
 
diff --git a/man/news.texi b/man/news.texi
index 8488b5a..bc47832 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -161,9 +161,7 @@ window name is not supposed to be changed in ICCCM.
 
 @item Added @code{keymap-trans} window-matcher [Scott Scriven]
 
- item Added @code{view-clipboard} function [Mark Triggs]
-
- item Added @code{display-message-with-timeout} @code{browser} commands [Christopher Bratusek]
+ item Added @code{browser} command [Christopher Bratusek]
 
 @item Added @code{move-window-center} command [Christopher Bratusek]
 
@@ -173,8 +171,6 @@ window name is not supposed to be changed in ICCCM.
 
 @item Improve position matcher to bind a window to a position (either @code{center} @code{east} @code{north} @code{north-east} @code{north-west} @code{south} @code{south-east} @code{south-west} @code{west}) OR to a user-given position [Jeremy Hankins]
 
- item When entering a different Workspace, it's now possible to display the name of it (like in Enlightenment) [Christopher Bratusek]
-
 @item GNOME integration updates
 
 Commands are updated for more recent GNOME. GNOME Integration is
diff --git a/src/display.c b/src/display.c
index cbc509a..28dea6f 100644
--- a/src/display.c
+++ b/src/display.c
@@ -86,8 +86,8 @@ error_handler (Display *dpy, XErrorEvent *ev)
 	    if (!WINDOW_IS_GONE_P (w))
 		remove_window (w, TRUE, TRUE);
 
-	    /* so we call emit_pending_destroys () at some point */
-	    rep_mark_input_pending (ConnectionNumber (dpy));
+	    /* so we call emit_pending_destroys () at some point
+	    rep_mark_input_pending (ConnectionNumber (dpy)); */
 	}
     }