Merge branch 'master' of /var/git/fvwmconf

diff --git a/aphrodite/rootmenu b/aphrodite/rootmenu
index 355480b1c2586f2874c867f2734cfc701aa2f29a..bfdabb309ab23468b5964418c76aa9bb6ca99459 100644 (file)
--- a/aphrodite/rootmenu
+++ b/aphrodite/rootmenu
@@ -10,11 +10,12 @@ AddToFunc   MakeMenuFvwmRoot
 + I PipeRead 'echo AddToMenu MenuFvwmRoot "$USER@`hostname`" Title'
 + I AddToMenu MenuFvwmRoot "Terminal%terminal.svg:16x16%" Exec exec $[TERMINAL]
 + I AddToMenu MenuFvwmRoot "Firefox%firefox.png%" Exec exec firefox
++ I AddToMenu MenuFvwmRoot "Thunar" Exec exec thunar
 + I AddToMenu MenuFvwmRoot "" Nop
 + I AddToMenu MenuFvwmRoot "Wallpaper%wallpaper.svg:16x16%" Popup MenuWallpaper
 + I AddToMenu MenuFvwmRoot "" Nop
 + I AddToMenu MenuFvwmRoot "Restart FVWM%reload.svg:16x16%" Restart
 + I AddToMenu MenuFvwmRoot "Exit FVWM%logout.svg:16x16%"\
-       Module FvwmForm FvwmForm-QuitVerify
+       Exec exec gxquitdialog
 
 Mouse 3 R A Menu MenuFvwmRoot

diff --git a/atropos/rootmenu b/atropos/rootmenu
index f2786bbecb29bd3fac8007e206b1326142a6617c..a7985df3c374ec564ecea1d0dbc2facb53f4e64b 100644 (file)
--- a/atropos/rootmenu
+++ b/atropos/rootmenu
@@ -26,7 +26,7 @@ AddToFunc   MakeMenuFvwmRoot
 + I AddToMenu MenuFvwmRoot "" Nop
 + I AddToMenu MenuFvwmRoot "Restart FVWM%reload.svg:16x16%" Restart
 + I AddToMenu MenuFvwmRoot "Exit FVWM%logout.svg:16x16%"\
-       Module FvwmForm FvwmForm-QuitVerify
+       Exec exec gxquitdialog --quit "FvwmCommand Quit"
 
 DestroyMenu MenuNetwork
 AddToMenu   MenuNetwork