From 2d163292508d214cea0487be405ad3833bc96c16 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Tue, 14 Nov 2000 00:03:52 +0000 Subject: [PATCH] Replace GNOME + Afterstep choice with GNOME + sawfish. This is a more popular configuration now. --- release/sysinstall/config.c | 6 +++--- release/sysinstall/menus.c | 2 +- usr.sbin/sade/config.c | 6 +++--- usr.sbin/sade/menus.c | 2 +- usr.sbin/sysinstall/config.c | 6 +++--- usr.sbin/sysinstall/menus.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index 6199345c7e6e..653ea7fb18dd 100644 --- a/release/sysinstall/config.c +++ b/release/sysinstall/config.c @@ -644,9 +644,9 @@ configXDesktop(dialogMenuItem *self) else if (!strcmp(desk, "gnome")) { ret = package_add("gnomecore"); if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) { - ret = package_add("afterstep"); - if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("afterstep")) - write_root_xprofile("gnome-session &\nexec afterstep"); + ret = package_add("sawfish"); + if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("sawfish")) + write_root_xprofile("gnome-session &\nexec sawfish"); } } else if (!strcmp(desk, "enlightenment")) { diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index 206b969818af..df6629f5b839 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -908,7 +908,7 @@ DMenu MenuXDesktops = { NULL, dmenuExit }, { "2 KDE", "The K Desktop Environment.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" }, - { "3 GNOME + Afterstep", "GNOME + Afterstep window manager.", + { "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" }, diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 6199345c7e6e..653ea7fb18dd 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -644,9 +644,9 @@ configXDesktop(dialogMenuItem *self) else if (!strcmp(desk, "gnome")) { ret = package_add("gnomecore"); if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) { - ret = package_add("afterstep"); - if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("afterstep")) - write_root_xprofile("gnome-session &\nexec afterstep"); + ret = package_add("sawfish"); + if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("sawfish")) + write_root_xprofile("gnome-session &\nexec sawfish"); } } else if (!strcmp(desk, "enlightenment")) { diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 206b969818af..df6629f5b839 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -908,7 +908,7 @@ DMenu MenuXDesktops = { NULL, dmenuExit }, { "2 KDE", "The K Desktop Environment.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" }, - { "3 GNOME + Afterstep", "GNOME + Afterstep window manager.", + { "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" }, diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 6199345c7e6e..653ea7fb18dd 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -644,9 +644,9 @@ configXDesktop(dialogMenuItem *self) else if (!strcmp(desk, "gnome")) { ret = package_add("gnomecore"); if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) { - ret = package_add("afterstep"); - if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("afterstep")) - write_root_xprofile("gnome-session &\nexec afterstep"); + ret = package_add("sawfish"); + if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("sawfish")) + write_root_xprofile("gnome-session &\nexec sawfish"); } } else if (!strcmp(desk, "enlightenment")) { diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 206b969818af..df6629f5b839 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -908,7 +908,7 @@ DMenu MenuXDesktops = { NULL, dmenuExit }, { "2 KDE", "The K Desktop Environment.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" }, - { "3 GNOME + Afterstep", "GNOME + Afterstep window manager.", + { "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" },