From 5305c7ad55add2773de10317f463ed14cb6d4787 Mon Sep 17 00:00:00 2001 From: bmah Date: Tue, 26 Nov 2002 22:14:34 +0000 Subject: Add GNOME 2 to the sysinstall desktop configuration menu, remove the two GNOME 1-based alternatives. While here, note that a majority of the items in this menu are not sentences, and remove trailing dots to make the remainder consistent. Reviewed by: marcus Approved by: re (bmah) --- usr.sbin/sade/config.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'usr.sbin/sade/config.c') diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 6536de7..d10e7ae 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -603,21 +603,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("gnomecore"); - 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"); - } + else if (!strcmp(desk, "gnome2")) { + ret = package_add("gnome2"); + if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) + write_root_xprofile("exec gnome-session\n"); } else if (!strcmp(desk, "afterstep")) { ret = package_add("afterstep"); -- cgit v1.1