diff options
author | bmah <bmah@FreeBSD.org> | 2002-11-26 22:14:34 +0000 |
---|---|---|
committer | bmah <bmah@FreeBSD.org> | 2002-11-26 22:14:34 +0000 |
commit | 5305c7ad55add2773de10317f463ed14cb6d4787 (patch) | |
tree | 4f05be4ce560cd8fe39fc4b81418d83c584c68a3 | |
parent | e7e1590ec6bd185936901503ca73cd07cd2740e8 (diff) | |
download | FreeBSD-src-5305c7ad55add2773de10317f463ed14cb6d4787.zip FreeBSD-src-5305c7ad55add2773de10317f463ed14cb6d4787.tar.gz |
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)
-rw-r--r-- | usr.sbin/sade/config.c | 19 | ||||
-rw-r--r-- | usr.sbin/sade/menus.c | 14 | ||||
-rw-r--r-- | usr.sbin/sysinstall/config.c | 19 | ||||
-rw-r--r-- | usr.sbin/sysinstall/menus.c | 14 |
4 files changed, 20 insertions, 46 deletions
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"); diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 56b8d0c..68c13e0 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -1088,17 +1088,15 @@ DMenu MenuXDesktops = { NULL, { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, - { "2 KDE", "The K Desktop Environment.", + { "2 KDE", "The K Desktop Environment", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" }, - { "3 GNOME + Sawfish", "GNOME + Sawfish window manager.", - NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome" }, - { "4 GNOME + Enlightenment","GNOME + The E window manager", - NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=enlightenment" }, - { "5 Afterstep", "The Afterstep window manager", + { "3 GNOME 2", "The GNOME 2 Desktop Environment", + NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome2" }, + { "4 Afterstep", "The Afterstep window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" }, - { "6 Windowmaker", "The Windowmaker window manager", + { "5 Windowmaker", "The Windowmaker window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" }, - { "7 fvwm", "The fvwm window manager", + { "6 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 6536de7..d10e7ae 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/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"); diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 56b8d0c..68c13e0 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -1088,17 +1088,15 @@ DMenu MenuXDesktops = { NULL, { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, - { "2 KDE", "The K Desktop Environment.", + { "2 KDE", "The K Desktop Environment", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" }, - { "3 GNOME + Sawfish", "GNOME + Sawfish window manager.", - NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome" }, - { "4 GNOME + Enlightenment","GNOME + The E window manager", - NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=enlightenment" }, - { "5 Afterstep", "The Afterstep window manager", + { "3 GNOME 2", "The GNOME 2 Desktop Environment", + NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome2" }, + { "4 Afterstep", "The Afterstep window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" }, - { "6 Windowmaker", "The Windowmaker window manager", + { "5 Windowmaker", "The Windowmaker window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" }, - { "7 fvwm", "The fvwm window manager", + { "6 fvwm", "The fvwm window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm2" }, { NULL } }, }; |