[sawfish: 6/6] Merge branch 'fdo-fix'

[Christopher Bratusek <chrisb src gnome org>]

commit d421c7f1e1680bfcc1ee6c58be07d5be0dae8ca5
Merge: d59cbd0... 63ea3a2...
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Wed Oct 7 14:39:59 2009 +0200

    Merge branch 'fdo-fix'
    
    Conflicts:
    	lisp/sawfish/wm/ext/fdo-menu.jl

 ChangeLog                       |    2 +
 lisp/sawfish/wm/ext/fdo-menu.jl |  217 +++++++++++++++++----------------------
 2 files changed, 95 insertions(+), 124 deletions(-)
---
diff --cc ChangeLog
index 7f13e77,70ecd6c..8102041
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,283 -1,3 +1,285 @@@
 +2009-10-07  Christopher Bratusek <zanghar freenet de>
 +	* src/events.c
 +	* lisp/sawfish/wm/focus.jl
 +	* lisp/sawfish/wm/transient.jl: merged timo/kde-menu-focus branch
 +
 +	* lisp/sawfish/wm/frames.jl: merged timo/frame-fix branch
 +
 +	* lisp/sawfish/wm/frames.jl
 +	* lisp/sawfish/wm/windows.jl: merged timo/kde4 branch
 +
 +	* src/keys.h: merged timo/mouse branch
 +
++	* lisp/sawfish/wm/ext/fdo-menu.jl: merged timo/fdo-fix branch
++
 +2009-10-05  Christopher Bratusek <zanghar freenet de>
 +	* lisp/sawfish/wm/defaults.jl
 +	* man/news.texi: removed try-require
 +
 +2009-10-03  Jeremy Hankins <nowan nowan org>
 +	* lisp/sawfish/cfg/main.jl.in
 +	* lisp/sawfish/gtk/widgets/font.jl.in
 +	* scripts/sawfish-about.jl.in: Whitespace cleanup in files that were missed before.
 +
 +2009-10-03  Teika kazura <teika lavabit com>
 +	* man/faq.texi: update on how to read info
 +
 +2009-10-01  Christopher Bratusek <zanghar freenet de>
 +	* configure.in
 +	* OPTIONS
 +	* src/play-sample.c
 +	* src/Makefile.in
 +	* Makedefs.in
 +	* sawfish.ebuild.in
 +	* lisp/sawfish/wm/util/play-audio.jl: removed built-in audio support, using /usr/bin/paplay by default
 +
 +	* man/sawfish.texi
 +	* KEYBINDINGS
 +	* lisp/sawfish/wm/frames.jl
 +	* lisp/sawfish/wm/keymaps.jl: added new buttons (frame-classes) (+ keymaps and docs):
 +                                      - sticky button
 +				      - lock button
 +				      - rename button
 +				      - move/resize button
 +				      - raise/lower button
 +
 +	* lisp/sawfish/wm/menus.jl: string change in customize-menu
 +
 +	* man/news.texi: updated
 +
 +	* OPTIONS: updated
 +
 +2009-10-01  Teika kazura <teika lavabit com>
 +	* OPTIONS
 +	* lisp/sawfish/wm/frames.jl
 +	* lisp/sawfish/wm/windows.jl
 +	* man/sawfish.texi: Doc on window types.
 +
 +2009-09-30  Teika kazura <teika lavabit com>
 +	* OPTIONS
 +	* lisp/sawfish/wm/windows.jl: Docstring of 'dont-avoid-ignored' is corrected.
 +
 +2009-09-29  Jeremy Hankins <nowan nowan org>
 +	* lisp/sawfish/cfg/apply.jl
 +	* lisp/sawfish/cfg/config.jl
 +	* lisp/sawfish/cfg/group.jl
 +	* lisp/sawfish/cfg/i18n.jl
 +	* lisp/sawfish/cfg/layout.jl
 +	* lisp/sawfish/cfg/layouts/keymaps.jl
 +	* lisp/sawfish/cfg/shell.jl
 +	* lisp/sawfish/cfg/slot.jl
 +	* lisp/sawfish/cfg/widgets/command.jl
 +	* lisp/sawfish/cfg/widgets/event.jl
 +	* lisp/sawfish/cfg/widgets/frame-style.jl
 +	* lisp/sawfish/cfg/widgets/gtk/icon.jl
 +	* lisp/sawfish/cfg/widgets/gtk/workspace-geometry.jl
 +	* lisp/sawfish/cfg/widgets/icon.jl
 +	* lisp/sawfish/cfg/widgets/keymap.jl
 +	* lisp/sawfish/cfg/widgets/match-window.jl
 +	* lisp/sawfish/cfg/widgets/modifier-list.jl
 +	* lisp/sawfish/cfg/widgets/workspace-geometry.jl
 +	* lisp/sawfish/cfg/wm.jl
 +	* lisp/sawfish/gtk/stock.jl
 +	* lisp/sawfish/gtk/widget-dialog.jl
 +	* lisp/sawfish/gtk/widget-test.jl
 +	* lisp/sawfish/gtk/widget.jl
 +	* lisp/sawfish/gtk/widgets/alist.jl
 +	* lisp/sawfish/gtk/widgets/color.jl
 +	* lisp/sawfish/gtk/widgets/file.jl
 +	* lisp/sawfish/gtk/widgets/list.jl
 +	* lisp/sawfish/gtk/widgets/pair.jl
 +	* lisp/sawfish/gtk/widgets/program.jl
 +	* lisp/sawfish/gtk/widgets/scheme-boolean.jl
 +	* lisp/sawfish/wm.jl
 +	* lisp/sawfish/wm/animation/outline.jl
 +	* lisp/sawfish/wm/autoload.jl
 +	* lisp/sawfish/wm/commands.jl
 +	* lisp/sawfish/wm/commands/cycle.jl
 +	* lisp/sawfish/wm/commands/describe.jl
 +	* lisp/sawfish/wm/commands/groups.jl
 +	* lisp/sawfish/wm/commands/grow-pack.jl
 +	* lisp/sawfish/wm/commands/help.jl
 +	* lisp/sawfish/wm/commands/move-cursor.jl
 +	* lisp/sawfish/wm/commands/move-resize.jl
 +	* lisp/sawfish/wm/commands/raise-commands.jl
 +	* lisp/sawfish/wm/commands/shrink-yank.jl
 +	* lisp/sawfish/wm/commands/size-window.jl
 +	* lisp/sawfish/wm/commands/slide-window.jl
 +	* lisp/sawfish/wm/commands/user.jl
 +	* lisp/sawfish/wm/commands/viewport-extras.jl
 +	* lisp/sawfish/wm/commands/viewport-linear.jl
 +	* lisp/sawfish/wm/commands/x-cycle.jl
 +	* lisp/sawfish/wm/cursors.jl
 +	* lisp/sawfish/wm/custom-defaults.jl
 +	* lisp/sawfish/wm/custom.jl
 +	* lisp/sawfish/wm/customize.jl
 +	* lisp/sawfish/wm/defaults.jl
 +	* lisp/sawfish/wm/ext/3d-hack.jl
 +	* lisp/sawfish/wm/ext/audio-events.jl
 +	* lisp/sawfish/wm/ext/auto-raise.jl
 +	* lisp/sawfish/wm/ext/beos-window-menu.jl
 +	* lisp/sawfish/wm/ext/edge-flip.jl
 +	* lisp/sawfish/wm/ext/error-handler.jl
 +	* lisp/sawfish/wm/ext/fdo-menu.jl
 +	* lisp/sawfish/wm/ext/hide-dialogs.jl
 +	* lisp/sawfish/wm/ext/infinite-desktop.jl
 +	* lisp/sawfish/wm/ext/match-window.jl
 +	* lisp/sawfish/wm/ext/old-window-menu.jl
 +	* lisp/sawfish/wm/ext/shade-hover.jl
 +	* lisp/sawfish/wm/ext/tooltips.jl
 +	* lisp/sawfish/wm/ext/window-history.jl
 +	* lisp/sawfish/wm/ext/workspace-grid.jl
 +	* lisp/sawfish/wm/extras.jl
 +	* lisp/sawfish/wm/focus.jl
 +	* lisp/sawfish/wm/frames.jl
 +	* lisp/sawfish/wm/gaol.jl
 +	* lisp/sawfish/wm/integration/gnome.jl
 +	* lisp/sawfish/wm/integration/kde.jl
 +	* lisp/sawfish/wm/keymaps.jl
 +	* lisp/sawfish/wm/menus.jl
 +	* lisp/sawfish/wm/misc.jl
 +	* lisp/sawfish/wm/placement.jl
 +	* lisp/sawfish/wm/placement/off-center.jl
 +	* lisp/sawfish/wm/placement/smart.jl
 +	* lisp/sawfish/wm/placement/stagger.jl
 +	* lisp/sawfish/wm/placement/top-left.jl
 +	* lisp/sawfish/wm/server.jl
 +	* lisp/sawfish/wm/session/init.jl
 +	* lisp/sawfish/wm/session/load.jl
 +	* lisp/sawfish/wm/session/save.jl
 +	* lisp/sawfish/wm/stacking.jl
 +	* lisp/sawfish/wm/state/configure.jl
 +	* lisp/sawfish/wm/state/iconify.jl
 +	* lisp/sawfish/wm/state/ignored.jl
 +	* lisp/sawfish/wm/state/maximize.jl
 +	* lisp/sawfish/wm/state/mwm.jl
 +	* lisp/sawfish/wm/state/open-look.jl
 +	* lisp/sawfish/wm/state/shading.jl
 +	* lisp/sawfish/wm/state/transient.jl
 +	* lisp/sawfish/wm/state/wm-spec.jl
 +	* lisp/sawfish/wm/swapper.jl
 +	* lisp/sawfish/wm/tabs/tab.jl
 +	* lisp/sawfish/wm/tabs/tabgroup.jl
 +	* lisp/sawfish/wm/theming/make-theme-preview.jl
 +	* lisp/sawfish/wm/theming/make-theme.jl
 +	* lisp/sawfish/wm/user.jl
 +	* lisp/sawfish/wm/util/compat.jl
 +	* lisp/sawfish/wm/util/decode-events.jl
 +	* lisp/sawfish/wm/util/display-window.jl
 +	* lisp/sawfish/wm/util/display-wininfo.jl
 +	* lisp/sawfish/wm/util/edges.jl
 +	* lisp/sawfish/wm/util/font.jl
 +	* lisp/sawfish/wm/util/groups.jl
 +	* lisp/sawfish/wm/util/gtkrc.jl
 +	* lisp/sawfish/wm/util/keymap-diff.jl
 +	* lisp/sawfish/wm/util/keymap.jl
 +	* lisp/sawfish/wm/util/marks.jl
 +	* lisp/sawfish/wm/util/nokogiri.jl
 +	* lisp/sawfish/wm/util/ping.jl
 +	* lisp/sawfish/wm/util/play-audio.jl
 +	* lisp/sawfish/wm/util/prompt-extras.jl
 +	* lisp/sawfish/wm/util/prompt-wm.jl
 +	* lisp/sawfish/wm/util/prompt.jl
 +	* lisp/sawfish/wm/util/recolor-image.jl
 +	* lisp/sawfish/wm/util/rects.jl
 +	* lisp/sawfish/wm/util/stacking.jl
 +	* lisp/sawfish/wm/util/window-order.jl
 +	* lisp/sawfish/wm/util/window-outline.jl
 +	* lisp/sawfish/wm/util/with-output.jl
 +	* lisp/sawfish/wm/util/workarea.jl
 +	* lisp/sawfish/wm/viewport.jl
 +	* lisp/sawfish/wm/window-anim.jl
 +	* lisp/sawfish/wm/windows.jl
 +	* lisp/sawfish/wm/workspace.jl
 +	* scripts/sawfish-client.jl
 +	* scripts/sawfish-menu.jl
 +	* themes/Crux/theme.jl
 +	* themes/Elberg-tabbed/theme.jl
 +	* themes/absolute-e/theme.jl
 +	* themes/brushed-metal/theme.jl
 +	* themes/get-S-tabbed/theme.jl
 +	* themes/gradient/theme.jl
 +	* themes/gtk/theme.jl
 +	* themes/microGUI/theme.jl
 +	* themes/mono/theme.jl
 +	* themes/mxflat/theme.jl
 +	* themes/simple/theme.jl
 +	* themes/smaker/theme.jl: General whitespace cleanup.  Indentation
 +	                          is standardized and lines (with a few
 +		                  exceptions -- mostly long strings) are
 +			          capped at 80 chars.
 +
 +2009-09-26  Christopher Bratusek <zanghar freenet de>
 +	* lisp/Makefile.in
 +	* lisp/sawfish/cfg/Makefile.in
 +	* configure.in
 +	* man/sawfish-ui.1
 +	* man/sawfish-config.1
 +	* lisp/sawfish/ui/
 +	* lisp/sawfish/cfg/: renamed `sawfish-ui' to `sawfish-config'
 +
 +	* OPTIONS
 +	* README.IMPORTANT
 +	* TODO
 +	* lisp/sawfish/wm/custom.jl
 +	* lisp/sawfish/wm/ext/match-window.jl
 +	* sawfish.ebuild.in
 +	* sawfish.spec.in
 +	* sawfish-ksm.desktop
 +	* sawfish-wm.desktop
 +	* themes/mxflat/theme.jl
 +	* themes/mxflat/CHANGELOG
 +	* themes/mxflat/README
 +	* themes/mxflat/TODO
 +	* CONTRIBUTING
 +	* man/sawfish.texi
 +	* man/news.texi: updated
 +
 +	* lisp/sawfish/cfg/widgets/match-window.jl: justify the `grab' button to the left
 +	                                            justify the labels to the left
 +
 +	* KEYBINDINGS: explained macros (artist formerly known as `nested keybindings')
 +	               added Multikey (aka Compose)
 +		       better explaination of ISO_Level3_Shift
 +
 +	* po/make-pot: removed --update (intltool + rep = puke)
 +
 +	* lisp/sawfish/wm/frames.jl
 +	* lisp/sawfish/wm/extras.jl: added customization options for changing font-color
 +	                             *independently* of what frame-style is beeing used
 +				     -- [Matthew Love, Christopher Bratusek]
 +
 +	* OPTIONS: updated
 +
 +	* man/sawfish.texi: added update-frame-font-color
 +
 +2009-09-25  Teika kazura <teika lavabit com>
 +	* lisp/sawfish/wm/autoload.jl
 +	* lisp/sawfish/wm/ext/match-window.jl
 +	* lisp/sawfish/wm/windows.jl: rename-window functions are moved to wm/windows.jl
 +
 +2009-09-23  Christopher Bratusek <zanghar freenet de>
 +	* man/news.texi: news items for 1.6.0 are partially rewritten [Teika Kazura]
 +
 +	* lisp/sawfish/wm/ext/fdo-menu.jl: small fix in the exile function [Matthew Love]
 +
 +	* lisp/sawfish/ui/widgets/frame-style.jl: also support tar.lzma and tar.xz here
 +	                                          make cursor invisible in the textview
 +						  set wrap-mode to word-char
 +
 +	* lisp/sawfish/ui/shell.jl: changed wm class of sawfish-ui from "main" "Nokogiri"
 +	                            to "sawfish-configurator" "Sawfish-Configurator"
 +
 +	* lisp/sawfish/wm/autoload.jl
 +	* lisp/sawfish/wm/ext/match-window: rename "Matched Windows" group to "Window Rules" in UI
 +
 +2009-09-22  Christopher Bratusek <zanghar freenet de>
 +	* lisp/sawfish/wm/viewport.jl: string-change
 +
 +	* OPTIONS: updated
 +	           fixed typos
 +		   removed old GNOME stuff
 +
  2009-09-21  Christopher Bratusek <zanghar freenet de>
  	* lisp/sawfish/wm/util/prompt.jl: temporary solution of previous work [Jeremy Hankins]
  
diff --cc lisp/sawfish/wm/ext/fdo-menu.jl
index e80b7d5,fe577e0..fae8379
--- a/lisp/sawfish/wm/ext/fdo-menu.jl
+++ b/lisp/sawfish/wm/ext/fdo-menu.jl
@@@ -47,10 -48,10 +48,10 @@@
      (make-variable-special 'apps-menu)
  
      ;; fdo-desktop-file-parsing
 -    
 +
      (define (desktop-file-p directory-file)
        (let ((this-file (open-file directory-file 'read)))
- 	(string= (read-line this-file) "[Desktop Entry]\012")))
+ 	(string= (read-line this-file) "[Desktop Entry]\n")))
  
      (define (desktop-group-p instring)
        (string= (substring instring 0 1) "["))
@@@ -63,9 -64,8 +64,8 @@@
      (define (get-key-break instring key)
        (if instring
  	  (let ((mlength (length instring)))
 -	    (do ((mcount 0 (1+ mcount))) 
 +	    (do ((mcount 0 (1+ mcount)))
  		((or (string= (substring instring mcount (+ mcount 1)) "\n")
- 		     (string= (substring instring mcount (+ mcount 1)) "\012")
  		     (string= (substring instring mcount (+ mcount 1)) key)
  		     (= mcount (- mlength 2))
  		     (= mcount 398)) mcount)))))