Hello,

This is a tiny big-fix to fvwm-menu-desktop which looks for the GNOME
application prefix in two locations:  the older apps/ directory and
the seemingly newer applications/ directory.  I don't believe this to
be standardised, but some distributions use the latter, whilst some
use the former, and vice-versa, so just check for both and be done
with it.

Kindly,

-- Thomas Adam
Index: ChangeLog
===================================================================
RCS file: /home/cvs/fvwm/fvwm/ChangeLog,v
retrieving revision 1.3061
diff -u -r1.3061 ChangeLog
--- ChangeLog	30 Dec 2008 13:32:40 -0000	1.3061
+++ ChangeLog	8 Feb 2009 03:45:08 -0000
@@ -1,3 +1,7 @@
+2008-02-08  Thomas Adam <[email protected]>
+	* bin/fvwm-menu-desktop.in:
+	Fix the location prefix for GNOME application files.
+
 2008-12-29  Alexandre Julliard  <[email protected]>
 
 	* fvwm/ewmh_events.c (ewmh_WMStateMaxHoriz):
Index: NEWS
===================================================================
RCS file: /home/cvs/fvwm/fvwm/NEWS,v
retrieving revision 1.767
diff -u -r1.767 NEWS
--- NEWS	30 Dec 2008 13:32:40 -0000	1.767
+++ NEWS	8 Feb 2009 03:45:10 -0000
@@ -31,6 +31,7 @@
    - Try to handle a bug an old version of the EWMH spec by
      honouring both, the _NET_WM_STATE_MAXIMIZED_HORIZ hint and
      the _NET_WM_STATE_MAXIMIZED_HORZ hitn.
+   - Fix the GNOME location prefix to application .desktop files.
 
 -------------------------------------------------------------------
 
Index: bin/fvwm-menu-desktop.in
===================================================================
RCS file: /home/cvs/fvwm/fvwm/bin/fvwm-menu-desktop.in,v
retrieving revision 1.5
diff -u -r1.5 fvwm-menu-desktop.in
--- bin/fvwm-menu-desktop.in	5 Jul 2005 15:03:53 -0000	1.5
+++ bin/fvwm-menu-desktop.in	8 Feb 2009 03:45:10 -0000
@@ -32,7 +32,9 @@
 
 my $GNOME_PREFIX = '/usr';		# gnome install-dir
 # Default is "gnome" since fvwm is gnome compliant and not kde compliant.
-my $APPS_DIR = "$GNOME_PREFIX/share/gnome/apps";
+my $APPS_DIR = -d "$GNOME_PREFIX/share/gnome/apps" ? 
+    "$GNOME_PREFIX/share/gnome/apps" :
+    "$GNOME_PREFIX/share/gnome/applications";
 my $GNOME_APPS = $APPS_DIR;
 my $KDE_PREFIX = $ENV{KDEDIR} || '/usr';
 my $KDE_APPS = "$KDE_PREFIX/share/applnk";

Reply via email to