summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rwxr-xr-xutil/fluxbox-generate_menu.in32
2 files changed, 18 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 49a29d8..67a487e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.0: 2Changes for 1.0.0:
3 * Fixed bug with fluxbox-generate_menu -is (thanks Jim Ramsay)
4 util/fluxbox-generate_menu.in
3*07/05/12: 5*07/05/12:
4 * Changed interpretation of Horizontal/Vertical maximization of a window that 6 * Changed interpretation of Horizontal/Vertical maximization of a window that
5 is already maximized (Mark) 7 is already maximized (Mark)
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index 52ded26..c5f0dd5 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -1326,22 +1326,22 @@ while [ $# -gt 0 ]; do
1326 -g) GNOMEMENU=yes; shift;; 1326 -g) GNOMEMENU=yes; shift;;
1327 -in) NO_ICON=yes; shift;; 1327 -in) NO_ICON=yes; shift;;
1328 -is) OTHER_ICONPATHS=" 1328 -is) OTHER_ICONPATHS="
1329 /usr/share/icons, 1329 /usr/share/icons
1330 /usr/share/icons/mini, 1330 /usr/share/icons/mini
1331 /usr/share/pixmaps, 1331 /usr/share/pixmaps
1332 /usr/local/share/icons, 1332 /usr/local/share/icons
1333 /usr/local/share/icons/mini, 1333 /usr/local/share/icons/mini
1334 /usr/local/share/pixmaps, 1334 /usr/local/share/pixmaps
1335 /usr/share/xclass/icons, 1335 /usr/share/xclass/icons
1336 /usr/share/xclass/pixmaps, 1336 /usr/share/xclass/pixmaps
1337 /usr/local/share/xclass/icons, 1337 /usr/local/share/xclass/icons
1338 /usr/local/share/xclass/pixmaps, 1338 /usr/local/share/xclass/pixmaps
1339 /usr/X11R6/share/icons/default/16x16, 1339 /usr/X11R6/share/icons/default/16x16
1340 /usr/X11R6/share/icons/kde/16x16, 1340 /usr/X11R6/share/icons/kde/16x16
1341 /usr/X11R6/share/icons/hicolor/16x16, 1341 /usr/X11R6/share/icons/hicolor/16x16
1342 /usr/local/X11R6/share/icons/default/16x16, 1342 /usr/local/X11R6/share/icons/default/16x16
1343 /usr/local/X11R6/share/icons/kde/16x16, 1343 /usr/local/X11R6/share/icons/kde/16x16
1344 /usr/local/X11R6/share/icons/hicolor/16x16, 1344 /usr/local/X11R6/share/icons/hicolor/16x16
1345 " 1345 "
1346 shift;; 1346 shift;;
1347 -ds) OTHER_DESKTOP_PATHS=" 1347 -ds) OTHER_DESKTOP_PATHS="