.fvwmrc: merge FireFox-Wait into FireFox

diff --git a/.fvwm/phd.m4 b/.fvwm/phd.m4
index e65ec35e1350d856ce8c2c41ad9bc9f2154ed724..f9db87c46ebe0fc8be0500f2bad36b817d510194 100644 (file)
--- a/.fvwm/phd.m4
+++ b/.fvwm/phd.m4
@@ -482,7 +482,7 @@ AddToFunc StartStandardSession
 +              I PaVuControl
 +              I Wait "Volume Control"
 +              I Exec exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
-+              I FireFox-Wait
++              I FireFox
 +              I GotoDeskAndPage 1 0 1
 +              I TERM_KOI8
 +              I Wait TERM
@@ -508,7 +508,7 @@ AddToFunc ResumeFunction
 +              I Exec sleep 10; exec "$HOME"/current/projects/audio-cdr-video/audio/pa-mic-off
 +              I Exec "$HOME"/current/projects/xsetbg/print-filename.py | text-wrap.py -w TEXT_WIDTH -s -n | gxmessage -buttons Ok -default Ok -fn 'MESSAGE_FONT' -file -
 +              I Wait gxmessage
-+              I None ("*Mozilla Firefox") FireFox-Wait
++              I None ("*Mozilla Firefox") FireFox
 +              I GotoDeskAndPage 0 1 0
 
 ############################################################################
@@ -602,10 +602,6 @@ DestroyFunc FireFox
 AddToFunc FireFox             I Any ("*Mozilla Firefox") Break
 +                             I GotoDeskAndPage 1 0 0
 +                             I Exec LC_CTYPE=ru_RU.KOI8-R exec start-browser firefox
-
-DestroyFunc FireFox-Wait
-AddToFunc FireFox-Wait        I Any ("*Mozilla Firefox") Break
-+                             I FireFox
 +                             I Wait "*Mozilla Firefox"
 
 DestroyFunc Gajim