Provide another installation option for GNOME so we have the more "classic

GNOME" desktop that Debian does as an option.
This commit is contained in:
Jordan K. Hubbard 1999-09-08 04:48:26 +00:00
parent 5407cadad6
commit 3349701ae5
6 changed files with 51 additions and 42 deletions

View File

@ -514,6 +514,14 @@ configXDesktop(dialogMenuItem *self)
write_root_xprofile("gnome-session &\nexec afterstep");
}
}
else if (!strcmp(desk, "enlightenment")) {
ret = package_add("gnomecore");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) {
ret = package_add("enlightenment");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment"))
write_root_xprofile("gnome-session &\nexec enlightenment\n");
}
}
else if (!strcmp(desk, "afterstep")) {
ret = package_add("afterstep");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("afterstep"))
@ -525,13 +533,8 @@ 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, "enlightenment")) {
ret = package_add("enlightenment");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment"))
write_root_xprofile("xterm &\nexec enlightenment\n");
}
else if (!strcmp(desk, "fvwm")) {
ret = package_add("fvwm");
else if (!strcmp(desk, "fvwm2")) {
ret = package_add("fvwm2");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm2"))
write_root_xprofile("xterm &\nexec fvwm2\n");
}

View File

@ -476,15 +476,15 @@ DMenu MenuXDesktops = {
NULL,
{ { "KDE", "The K Desktop Environment.",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" },
{ "GNOME", "The GNOME desktop environment.",
{ "GNOME + Afterstep", "GNOME + Afterstep window manager.",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome" },
{ "Afterstep", "The Afterstep Window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" },
{ "Windowmaker", "The Windowmaker Window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" },
{ "Enlightenment","The E Window manager (24 bit recommended)",
{ "GNOME + Enlightenment","GNOME + The E window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=enlightenment" },
{ "fvwm", "The fvwm Window manager",
{ "Afterstep", "The Afterstep window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" },
{ "Windowmaker", "The Windowmaker window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" },
{ "fvwm2", "The fvwm2 window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm" },
{ NULL } },
};

View File

@ -514,6 +514,14 @@ configXDesktop(dialogMenuItem *self)
write_root_xprofile("gnome-session &\nexec afterstep");
}
}
else if (!strcmp(desk, "enlightenment")) {
ret = package_add("gnomecore");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) {
ret = package_add("enlightenment");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment"))
write_root_xprofile("gnome-session &\nexec enlightenment\n");
}
}
else if (!strcmp(desk, "afterstep")) {
ret = package_add("afterstep");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("afterstep"))
@ -525,13 +533,8 @@ 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, "enlightenment")) {
ret = package_add("enlightenment");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment"))
write_root_xprofile("xterm &\nexec enlightenment\n");
}
else if (!strcmp(desk, "fvwm")) {
ret = package_add("fvwm");
else if (!strcmp(desk, "fvwm2")) {
ret = package_add("fvwm2");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm2"))
write_root_xprofile("xterm &\nexec fvwm2\n");
}

View File

@ -476,15 +476,15 @@ DMenu MenuXDesktops = {
NULL,
{ { "KDE", "The K Desktop Environment.",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" },
{ "GNOME", "The GNOME desktop environment.",
{ "GNOME + Afterstep", "GNOME + Afterstep window manager.",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome" },
{ "Afterstep", "The Afterstep Window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" },
{ "Windowmaker", "The Windowmaker Window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" },
{ "Enlightenment","The E Window manager (24 bit recommended)",
{ "GNOME + Enlightenment","GNOME + The E window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=enlightenment" },
{ "fvwm", "The fvwm Window manager",
{ "Afterstep", "The Afterstep window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" },
{ "Windowmaker", "The Windowmaker window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" },
{ "fvwm2", "The fvwm2 window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm" },
{ NULL } },
};

View File

@ -514,6 +514,14 @@ configXDesktop(dialogMenuItem *self)
write_root_xprofile("gnome-session &\nexec afterstep");
}
}
else if (!strcmp(desk, "enlightenment")) {
ret = package_add("gnomecore");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) {
ret = package_add("enlightenment");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment"))
write_root_xprofile("gnome-session &\nexec enlightenment\n");
}
}
else if (!strcmp(desk, "afterstep")) {
ret = package_add("afterstep");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("afterstep"))
@ -525,13 +533,8 @@ 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, "enlightenment")) {
ret = package_add("enlightenment");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment"))
write_root_xprofile("xterm &\nexec enlightenment\n");
}
else if (!strcmp(desk, "fvwm")) {
ret = package_add("fvwm");
else if (!strcmp(desk, "fvwm2")) {
ret = package_add("fvwm2");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("fvwm2"))
write_root_xprofile("xterm &\nexec fvwm2\n");
}

View File

@ -476,15 +476,15 @@ DMenu MenuXDesktops = {
NULL,
{ { "KDE", "The K Desktop Environment.",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" },
{ "GNOME", "The GNOME desktop environment.",
{ "GNOME + Afterstep", "GNOME + Afterstep window manager.",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome" },
{ "Afterstep", "The Afterstep Window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" },
{ "Windowmaker", "The Windowmaker Window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" },
{ "Enlightenment","The E Window manager (24 bit recommended)",
{ "GNOME + Enlightenment","GNOME + The E window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=enlightenment" },
{ "fvwm", "The fvwm Window manager",
{ "Afterstep", "The Afterstep window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" },
{ "Windowmaker", "The Windowmaker window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" },
{ "fvwm2", "The fvwm2 window manager",
NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm" },
{ NULL } },
};