d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly deal with the fvwm desktop - this should restore that option

Browse Source 
to functionality.
This commit is contained in:
Jordan K. Hubbard 2001-03-12 22:43:27 +00:00
parent 503d3c0277
commit c95f3d84ce
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/sade/config.c
View File

@ -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"

2
usr.sbin/sade/menus.c
View File

@ -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 } },
};

6
usr.sbin/sysinstall/config.c
View File

@ -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"

2
usr.sbin/sysinstall/menus.c
View File

@ -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 } },
};