From: Nick Bowler <nbowler@draconx.ca>
Date: Wed, 15 Jul 2009 01:53:09 +0000 (-0400)
Subject: Merge branch 'master' of /var/git/fvwmconf
X-Git-Url: http://git.draconx.ca/gitweb/fvwmconf.git/commitdiff_plain/735fb38c868231eb4504ffc9747edf9c7939a9a9?hp=8d6c0e06439ffa0539e6b59def94636bf5edb657

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

diff --git a/aphrodite/rootmenu b/aphrodite/rootmenu
index 355480b..bfdabb3 100644
--- 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 f2786bb..a7985df 100644
--- 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