From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 24 Jun 2000 13:19:23 +0000 (+0000)
Subject: - use pre/post include feature of wmconfig 0.9.8-3
X-Git-Tag: fvwm-1_24r-23~4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffvwm.git;a=commitdiff_plain;h=51113dd696dbe9f213fabb9ed93fee6f9109537f

- use pre/post include feature of wmconfig 0.9.8-3

Changed files:
    fvwm-system.fvwmrc -> 1.3
---

diff --git a/fvwm-system.fvwmrc b/fvwm-system.fvwmrc
index 7c1273f..dd6a3a6 100644
--- a/fvwm-system.fvwmrc
+++ b/fvwm-system.fvwmrc
@@ -394,20 +394,7 @@ Function "window_ops_func"
 	Close  "DoubleClick"  
 EndFunction
 
-esyscmd(wmconfig --output afterstep --rootmenu Programs)
-
-# This menu will fire up some very common utilities
-Popup "MainMenu"
-	Title 	"Main Menu"
-	Exec    "Xterm"		exec xterm &
-	Exec    "Rxvt"		exec rxvt -bg Black -fg Wheat &
-	Nop	""
-	Popup	"Programs"	Programs
-	Popup	"Modules"	Module-Popup
-	Nop	""
-        Restart "Restart Fvwm"  fvwm
-	Popup	"Exit Fvwm"	Quit-Verify
-EndPopup
+esyscmd(wmconfig --output afterstep --rootmenu MainMenu --pre-include /etc/X11/fvwm/menu.fvwm.pre --post-include /etc/X11/fvwm/menu.fvwm.post)
 
 ##############################################################################
 # This defines the mouse bindings