Update configs after upgrading to Debian 9 "stretch"

[dotfiles.git] / .fvwm / main.m4

diff --git a/.fvwm/main.m4 b/.fvwm/main.m4
index b93b61542eb347d07d3bd654a43e9d4ff9748667..ec53dcf03054100e96673bffccdd0af1958ae09f 100644 (file)
--- a/.fvwm/main.m4
+++ b/.fvwm/main.m4
@@ -140,27 +140,6 @@ TERM_KOI8 -geometry TERM_GEOM_BIG -title "$2" -n "$2" -e ssh -4 "$1")
 define(`REMOTE_HOST_KOI8_BIG_MENU',
 "$2 (koi8)" REMOTE_HOST_KOI8_BIG($1, $2))
 
-define(`SSH_CONNECTION_SHARING_TERM',
-$1 -title "git@$3" -n "git@$3" -e ssh -N4 "$2")
-
-define(`SSH_CONNECTION_SHARING_UTF8',
-SSH_CONNECTION_SHARING_TERM(TERM_UTF8, $1, $2))
-
-define(`SSH_CONNECTION_SHARING_UTF8_BOTLT',
-SSH_CONNECTION_SHARING_TERM(TERM_UTF8_BOTLT, $1, $2))
-
-define(`SSH_CONNECTION_SHARING_UTF8_BOTRT',
-SSH_CONNECTION_SHARING_TERM(TERM_UTF8_BOTRT, $1, $2))
-
-define(`SSH_CONNECTION_SHARING_UTF8_MENU',
-"git@$2 (utf8)" SSH_CONNECTION_SHARING_UTF8($1, $2))
-
-define(`SSH_CONNECTION_SHARING_UTF8_BOTLT_MENU',
-"git@$2 (utf8,btlt)" SSH_CONNECTION_SHARING_UTF8_BOTLT($1, $2))
-
-define(`SSH_CONNECTION_SHARING_UTF8_BOTRT_MENU',
-"git@$2 (utf8,btrt)" SSH_CONNECTION_SHARING_UTF8_BOTRT($1, $2))
-
 divert
 
 ##########################################################################
@@ -168,7 +147,7 @@ divert
 #
 # Colon seperated unix directory paths for Modules, xpm files, and bitmaps
 #ModulePath /usr/lib/fvwm
-ImagePath /usr/share/pixmaps/fvwm:/usr/share/pixmaps:/usr/include/X11/bitmaps #:/usr/local/firefox/chrome/icons/default:/usr/local/firefox/icons
+ImagePath /usr/share/pixmaps/fvwm:/usr/share/pixmaps:/usr/include/X11/bitmaps #:/usr/local/firefox/browser/chrome/icons/default:/usr/local/firefox/browser/icons
 
 ############################################################################
 # COLORS and FONTS
@@ -288,6 +267,7 @@ Style "*Pidgin*"        MinOverlapPercentPlacement
 
 # (S)MPlayer
 Style "*MPlayer*"       Layer 6, PositionPlacement 350p 100p
+Style "*mpv"            Layer 6, PositionPlacement 350p 100p
 
 Style "*clock"          !Title, Sticky, WindowListSkip, Color Black/#40c040, NeverFocus, PositionPlacement 50-50w +1p, Layer 2
 Style "emacs"           NoPPosition
@@ -634,8 +614,8 @@ AddToFunc FireFox             I Any ("*Mozilla Firefox") Break
 +                             I GotoDeskAndPage 1 0 0
 +                             I Exec exec start-browser firefox
 +                             I Wait "*Mozilla Firefox"
-+                             I All ("*Mozilla Firefox") Lower
-+                             I Exec webbrowserX -n file:///home/phd/Internet/WWW/dashboard/index.html; exec webbrowserX -t file:///home/phd/Internet/WWW/dashboard/internet.html
++                             I All ("*Mozilla Firefox") Iconify true
++                             I Exec webbrowserX -n file:///home/phd/Internet/WWW/dashboard/index.html
 +                             I Wait "*Mozilla Firefox"
 
 DestroyFunc Gajim
@@ -727,14 +707,7 @@ AddToMenu TermColors    "Term Colors" Title
 +                       "Term: white/deeppink" TERM_KOI8 -fg white -cr white -bg deeppink
 +                       "Term: white/black" TERM_KOI8 -fg white -cr white -bg black
 
-AddToMenu SSH-connection-sharing "SSH connection sharing" Title
-+                       SSH_CONNECTION_SHARING_UTF8_MENU(phd@git.code.sf.net, SF)
-+                       SSH_CONNECTION_SHARING_UTF8_BOTLT_MENU(git@gitlab.com, gitlab)
-+                       SSH_CONNECTION_SHARING_UTF8_BOTRT_MENU(git@github.com, github)
-
 AddToMenu Systems       "Systems" Title
-+                       "SSH connection sharing" Popup SSH-connection-sharing
-+                       ""        Nop
 +                       REMOTE_HOST_KOI8_MENU(phdru.name, phdru)
 +                       REMOTE_HOST_UTF8_MENU(phdru.name, phdru)
 +                       REMOTE_HOST_KOI8_BIG_MENU(phdru.name, PHDRU)