diff options
| author | jkh <jkh@FreeBSD.org> | 2001-03-12 22:43:27 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 2001-03-12 22:43:27 +0000 |
| commit | 2cf26edecc60bd4171ebdb3ecea748f06259f316 (patch) | |
| tree | 652765a0d24d7a0dbc53feec2e54ba8c66fea6a1 /usr.sbin | |
| parent | 07e97d2a867658eb2c0e7c18963f3cab1e275c9a (diff) | |
| download | FreeBSD-src-2cf26edecc60bd4171ebdb3ecea748f06259f316.zip FreeBSD-src-2cf26edecc60bd4171ebdb3ecea748f06259f316.tar.gz | |
Properly deal with the fvwm desktop - this should restore that option
to functionality.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/config.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sade/menus.c | 2 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/config.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/menus.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 9a15299..3a5f9df 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -668,10 +668,10 @@ configXDesktop(dialogMenuItem *self) write_root_xprofile("xterm &\n[ ! -d $HOME/GNUstep/Library/WindowMaker ] && /usr/X11R6/bin/wmaker.inst\nexec /usr/X11R6/bin/wmaker\n"); } } - else if (!strcmp(desk, "fvwm2")) { + else if (!strcmp(desk, "fvwm")) { ret = package_add("fvwm"); - if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm2")) - write_root_xprofile("xterm &\nexec fvwm2\n"); + if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm")) + write_root_xprofile("xterm &\nexec fvwm\n"); } if (DITEM_STATUS(ret) == DITEM_FAILURE) msgConfirm("An error occurred while adding the package(s) required\n" diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 801a121..6b922ba 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -922,7 +922,7 @@ DMenu MenuXDesktops = { NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" }, { "6 Windowmaker", "The Windowmaker window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" }, - { "7 fvwm2", "The fvwm2 window manager", + { "7 fvwm", "The fvwm window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm2" }, { NULL } }, }; diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 9a15299..3a5f9df 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -668,10 +668,10 @@ configXDesktop(dialogMenuItem *self) write_root_xprofile("xterm &\n[ ! -d $HOME/GNUstep/Library/WindowMaker ] && /usr/X11R6/bin/wmaker.inst\nexec /usr/X11R6/bin/wmaker\n"); } } - else if (!strcmp(desk, "fvwm2")) { + else if (!strcmp(desk, "fvwm")) { ret = package_add("fvwm"); - if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm2")) - write_root_xprofile("xterm &\nexec fvwm2\n"); + if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm")) + write_root_xprofile("xterm &\nexec fvwm\n"); } if (DITEM_STATUS(ret) == DITEM_FAILURE) msgConfirm("An error occurred while adding the package(s) required\n" diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 801a121..6b922ba 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -922,7 +922,7 @@ DMenu MenuXDesktops = { NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" }, { "6 Windowmaker", "The Windowmaker window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" }, - { "7 fvwm2", "The fvwm2 window manager", + { "7 fvwm", "The fvwm window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm2" }, { NULL } }, }; |
