aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Stokely <murray@FreeBSD.org>2003-03-27 18:15:23 +0000
committerMurray Stokely <murray@FreeBSD.org>2003-03-27 18:15:23 +0000
commitee553c69b6a33524c52c36876a008d99d17ac4c3 (patch)
tree452d92ab790799e5d356d45f3c6796ef427c1df9
parent34ae96a42c9904b565329fb9482c5e87ca2783cf (diff)
MFC: Offer GNOME2 instead of GNOME 1 from the desktop configuration
menu. Approved by: re, portmgr, gnome
Notes
Notes: svn path=/releng/4.8/; revision=112713
-rw-r--r--release/sysinstall/config.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index abf9dfe46b81..5a1e13cecc07 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -596,20 +596,10 @@ configXDesktop(dialogMenuItem *self)
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("startkde"))
write_root_xprofile("exec startkde\n");
}
- else if (!strcmp(desk, "gnome")) {
- ret = package_add("gnome");
+ else if (!strcmp(desk, "gnome2")) {
+ ret = package_add("gnome2");
if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) {
- ret = package_add("sawfish-gnome");
- if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("sawfish"))
- write_root_xprofile("exec gnome-session\n");
- }
- }
- 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("exec gnome-session\n");
+ write_root_xprofile("exec gnome-session\n");
}
}
else if (!strcmp(desk, "afterstep")) {