kdm: drop bootloader support

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kdm/backend/CMakeLists.txt b/kdm/backend/CMakeLists.txt
index 20fb4be..ce33a9f 100644 (file)
--- a/kdm/backend/CMakeLists.txt
+++ b/kdm/backend/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(kdm_SRCS
     dm.h
     auth.c
-    bootman.c
     client.c
     ctrl.c
     daemon.c

diff --git a/kdm/backend/bootman.c b/kdm/backend/bootman.c
deleted file mode 100644 (file)
index 5aa35a3..0000000
--- a/kdm/backend/bootman.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/*
-
-Copyright 2005 Stephan Kulow <coolo@kde.org>
-Copyright 2005 Oswald Buddenhagen <ossi@kde.org>
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from the copyright holder.
-
-*/
-
-/*
- * xdm - display manager daemon
- * Author: Keith Packard, MIT X Consortium
- *
- * Boot options
- */
-
-#include "dm.h"
-#include "dm_error.h"
-
-#include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/stat.h>
-
-#define SEP " >> "
-
-static int
-getNull(char ***opts ATTR_UNUSED, int *def ATTR_UNUSED, int *cur ATTR_UNUSED)
-{
-    return BO_NOMAN;
-}
-
-static int
-setNull(const char *opt ATTR_UNUSED, SdRec *sdr ATTR_UNUSED)
-{
-    return BO_NOMAN;
-}
-
-static char *
-match(char *obuf, int *blen, const char *key, int klen)
-{
-    char *buf = obuf;
-    if (memcmp(buf, key, klen) || !isspace(buf[klen]))
-        return 0;
-    buf += klen + 1;
-    for (; isspace(*buf); buf++);
-    if (!*buf)
-        return 0;
-    *blen -= buf - obuf;
-    return buf;
-}
-
-#define GRUB_MENU "/boot/grub/menu.lst"
-
-static char *grubSetDefault;
-static char *grub;
-
-static int
-getGrub(char ***opts, int *def, int *cur)
-{
-    FILE *f;
-    char *ptr, *linp;
-    int len;
-    char line[1000];
-
-    if (!grubSetDefault && !grub &&
-        !(grubSetDefault = locate("grub-set-default")) &&
-        !(grub = locate("grub")))
-        return BO_NOMAN;
-
-    *def = 0;
-    *cur = -1;
-    *opts = initStrArr(0);
-
-    if (!(f = fopen(GRUB_MENU, "r")))
-        return errno == ENOENT ? BO_NOMAN : BO_IO;
-    while ((len = fGets(line, sizeof(line), f)) != -1) {
-        for (linp = line; isspace(*linp); linp++, len--);
-        if ((ptr = match(linp, &len, "default", 7))) {
-            *def = atoi(ptr);
-        } else if ((ptr = match(linp, &len, "title", 5))) {
-            for (; isspace(ptr[len - 1]); len--);
-            *opts = addStrArr(*opts, ptr, len);
-        }
-    }
-    fclose(f);
-
-    return BO_OK;
-}
-
-static int
-setGrub(const char *opt, SdRec *sdr)
-{
-    FILE *f;
-    char *ptr;
-    int len, i;
-    char line[1000];
-
-    if (!(f = fopen(GRUB_MENU, "r")))
-        return errno == ENOENT ? BO_NOMAN : BO_IO;
-    for (i = 0; (len = fGets(line, sizeof(line), f)) != -1;)
-        if ((ptr = match(line, &len, "title", 5))) {
-            if (!strcmp(ptr, opt)) {
-                fclose(f);
-                sdr->osindex = i;
-                sdr->bmstamp = mTime(GRUB_MENU);
-                return strDup(&sdr->osname, opt) ? BO_OK : BO_IO;
-            }
-            i++;
-        }
-    fclose(f);
-    return BO_NOENT;
-}
-
-static void
-commitGrub(void)
-{
-    if (sdRec.bmstamp != mTime(GRUB_MENU) &&
-            setGrub(sdRec.osname, &sdRec) != BO_OK)
-        return;
-
-    if (grubSetDefault) {
-        /* The grub-set-default command must be used, which is
-         * not so good because there is no way of setting an
-         * entry for the next boot only. */
-        char index[16];
-        const char *args[] = { grubSetDefault, index, 0 };
-        sprintf(index, "%d", sdRec.osindex);
-        runAndWait((char **)args, environ);
-    } else {
-        /* The grub shell can be used with `savedefault'.
-         * That requires a (widely distributed) patch to grub, e.g.
-         * grub-0.97-once.patch. It won't work with a vanilla grub.*/
-        FILE *f;
-        int pid;
-        static const char *args[] = { 0, "--batch", "--no-floppy", 0 };
-        args[0] = grub;
-        if ((f = pOpen((char **)args, 'w', &pid))) {
-            fprintf(f, "savedefault --default=%d --once\n", sdRec.osindex);
-            pClose(f, &pid);
-        }
-    }
-}
-
-#define GRUB2_MAX_MENU_LEVEL 5
-
-static char *grubReboot;
-static const char *grubConfig;
-
-static int
-parseGrubTitle(char *title)
-{
-    int len;
-    char *ptr = title;
-
-    if (!title)
-        return -1;
-
-    if (*ptr == '\'') {
-        for (len = 0, ptr++; *ptr && *ptr != '\''; ptr++)
-            title[len++] = *ptr;
-    } else if (*ptr == '"') {
-        for (len = 0, ptr++; *ptr && *ptr != '"'; ptr++) {
-            if (*ptr == '\\') {
-                switch (*(++ptr)) {
-                case 0:
-                    return -1; /* Unexpected end */
-                case '$':
-                case '"':
-                case '\\':
-                    break;
-                default:
-                    title[len++] = '\\';
-                    break;
-                }
-            }
-            title[len++] = *ptr;
-        }
-    } else {
-        for (len = 0; *ptr && !isspace(*ptr); ptr++) {
-            if (*ptr == '\\' && !*(++ptr))
-                return -1; /* Unexpected end */
-            title[len++] = *ptr;
-        }
-    }
-
-    return *ptr ? len : -1;
-}
-
-static int
-buildBootList(char ***opts, char *title, int menuLvl, int *menus)
-{
-    int len;
-
-    if ((len = parseGrubTitle(title)) < 0)
-        return -1;
-
-    if (menuLvl > 0) {
-        char **strp;
-        title[len] = '\0';
-        *opts = extStrArr(*opts, &strp);
-        strApp(strp, (*opts)[menus[menuLvl - 1]], SEP, title, (char *)0);
-    } else {
-        *opts = addStrArr(*opts, title, len);
-    }
-
-    return 0;
-}
-
-static int
-getGrub2OrBurg(char ***opts, int *def, int *cur, const char *grubRebootExec)
-{
-    FILE *f;
-    char *ptr, *linp;
-    int len, ret = BO_NOMAN, menuLvl = 0, inEntry = 0;
-    char line[1000];
-    int menus[GRUB2_MAX_MENU_LEVEL];
-
-    if (!grubReboot && !(grubReboot = locate(grubRebootExec)))
-        return BO_NOMAN;
-
-    *def = -1;
-    *cur = -1;
-    *opts = initStrArr(0);
-
-    if (!(f = fopen(grubConfig, "r")))
-        return errno == ENOENT ? BO_NOMAN : BO_IO;
-    while ((len = fGets(line, sizeof(line), f)) != -1) {
-        for (linp = line; isspace(*linp); linp++, len--);
-        for (; isspace(*(linp + len - 1)); len--);
-        if ((ptr = match(linp, &len, "set", 3)) && !memcmp(ptr, "default=\"${saved_entry}\"", 24)) {
-            ret = BO_OK;
-        } else if ((ptr = match(linp, &len, "menuentry", 9))) {
-            if (menuLvl <= GRUB2_MAX_MENU_LEVEL) {
-                if (buildBootList(opts, ptr, menuLvl, menus) < 0) {
-                    ret = BO_IO;
-                    break;
-                }
-            }
-            inEntry = 1;
-        } else if ((ptr = match(linp, &len, "submenu", 7))) {
-            if (menuLvl < GRUB2_MAX_MENU_LEVEL) {
-                menus[menuLvl] = arrLen(*opts);
-                if (buildBootList(opts, ptr, menuLvl, menus) < 0) {
-                    ret = BO_IO;
-                    break;
-                }
-            } else {
-                logWarn("Only " stringify(GRUB2_MAX_MENU_LEVEL) " nesting levels are supported in Grub2 menus.\n");
-            }
-            menuLvl++;
-        } else if (linp[len - 1] == '}') {
-            if (inEntry)
-                inEntry = 0;
-            else if (menuLvl > 0)
-                menuLvl--;
-        }
-    }
-    fclose(f);
-
-    return ret;
-}
-
-static int
-getGrub2(char ***opts, int *def, int *cur)
-{
-    struct stat buff;
-
-    grubConfig = "/boot/grub2/grub.cfg";
-    if (!stat(grubConfig, &buff))
-        return getGrub2OrBurg(opts, def, cur, "grub2-reboot");
-
-    grubConfig = "/boot/grub/grub.cfg";
-    return getGrub2OrBurg(opts, def, cur, "grub-reboot");
-}
-
-static int
-setGrub2(const char *opt, SdRec *sdr)
-{
-    char **opts;
-    int def, cur, ret, i;
-
-    if ((ret = getGrub2(&opts, &def, &cur)) != BO_OK)
-        return ret;
-    for (i = 0; opts[i]; i++) {
-        if (!strcmp(opts[i], opt)) {
-            sdr->bmstamp = mTime(grubConfig);
-            freeStrArr(opts);
-            return (sdr->osname = replaceInString(opt, SEP, ">")) ? BO_OK : BO_IO;
-        }
-    }
-    freeStrArr(opts);
-    return BO_NOENT;
-}
-
-static void
-commitGrub2(void)
-{
-    if (sdRec.bmstamp != mTime(grubConfig) &&
-        setGrub2(sdRec.osname, &sdRec) != BO_OK)
-        return;
-
-    if (grubReboot) {
-        const char *args[] = { grubReboot, sdRec.osname, 0 };
-        runAndWait((char **)args, environ);
-    }
-}
-
-static int
-getBurg(char ***opts, int *def, int *cur)
-{
-    grubConfig = "/boot/burg/burg.cfg";
-    return getGrub2OrBurg(opts, def, cur, "burg-reboot");
-}
-
-static char *lilo;
-
-static int
-getLilo(char ***opts, int *def, int *cur)
-{
-    FILE *f;
-    int cdef, pid, len, ret = BO_OK;
-    static const char *args[5] = { 0, "-w", "-v", "-q", 0 };
-    char buf[256], next[256];
-
-    if (!lilo && !(lilo = locate("lilo")))
-        return BO_NOMAN;
-
-    args[0] = lilo;
-    if (!(f = pOpen((char **)args, 'r', &pid)))
-        return BO_IO;
-    *opts = 0;
-    next[0] = 0;
-    for (;;) {
-        if ((len = fGets(buf, sizeof(buf), f)) == -1) {
-            ret = BO_NOMAN;
-            goto out;
-        }
-        if (!memcmp(buf, "Images:", 7))
-            break;
-#define Ldeflin "  Default boot command line:"
-        if (!memcmp(buf, Ldeflin, strlen(Ldeflin))) {
-            memcpy(next, buf + strlen(Ldeflin) + 2, len - strlen(Ldeflin) - 3);
-            next[len - strlen(Ldeflin) - 3] = 0;
-        }
-    }
-    cdef = *def = 0;
-    *cur = -1;
-    *opts = initStrArr(0);
-    while ((len = fGets(buf, sizeof(buf), f)) != -1)
-        if (buf[0] == ' ' && buf[1] == ' ' && buf[2] != ' ') {
-            if (buf[len - 1] == '*') {
-                *def = cdef;
-                len--;
-            }
-            for (; buf[len - 1] == ' '; len--);
-            *opts = addStrArr(*opts, buf + 2, len - 2);
-            if (!strcmp((*opts)[cdef], next))
-                *cur = cdef;
-            cdef++;
-        }
-  out:
-    if (pClose(f, &pid)) {
-        if (*opts)
-            freeStrArr(*opts);
-        return BO_IO;
-    }
-    return ret;
-}
-
-static int
-setLilo(const char *opt, SdRec *sdr)
-{
-    char **opts;
-    int def, cur, ret, i;
-
-    if ((ret = getLilo(&opts, &def, &cur)) != BO_OK)
-        return ret;
-    if (!*opt) {
-        opt = 0;
-    } else {
-        for (i = 0; opts[i]; i++)
-            if (!strcmp(opts[i], opt))
-                goto oke;
-        freeStrArr(opts);
-        return BO_NOENT;
-    }
-  oke:
-    freeStrArr(opts);
-    return strDup(&sdr->osname, opt) ? BO_OK : BO_IO;
-}
-
-static void
-commitLilo(void)
-{
-    static const char *args[5] = { 0, "-w", "-R", 0, 0 };
-
-    args[0] = lilo;
-    args[3] = sdRec.osname;
-    runAndWait((char **)args, environ);
-}
-
-static const struct {
-    int (*get)(char ***, int *, int *);
-    int (*set)(const char *, SdRec *);
-    void (*commit)(void);
-} bootOpts[] = {
-    { getNull, setNull, 0 },
-    { getGrub, setGrub, commitGrub },
-    { getGrub2, setGrub2, commitGrub2 },
-    { getBurg, setGrub2, commitGrub2 },
-    { getLilo, setLilo, commitLilo },
-};
-
-int
-getBootOptions(char ***opts, int *def, int *cur)
-{
-    return bootOpts[bootManager].get(opts, def, cur);
-}
-
-int
-setBootOption(const char *opt, SdRec *sdr)
-{
-    free(sdr->osname);
-    sdr->osname = 0;
-    return opt ? bootOpts[bootManager].set(opt, sdr) : BO_OK;
-}
-
-void
-commitBootOption(void)
-{
-    if (sdRec.osname) {
-        bootOpts[bootManager].commit();
-/*
-        free(sdRec.osname);
-        sdRec.osname = 0;
-*/
-    }
-}
-

diff --git a/kdm/backend/ctrl.c b/kdm/backend/ctrl.c
index f12ae2b..eaeec36 100644 (file)
--- a/kdm/backend/ctrl.c
+++ b/kdm/backend/ctrl.c
@@ -466,8 +466,6 @@ processCtrl(const char *string, int len, int fd, struct display *d)
             if (ar[1])
                 goto exce;
             Reply("ok\tkdm\tlist\t");
-            if (bootManager != BO_NONE)
-                Reply("bootoptions\t");
             if (d) {
                 if ((d->displayType & d_location) == dLocal)
                     Reply("local\t" CMD_ACTIVATE);
@@ -615,21 +613,6 @@ processCtrl(const char *string, int len, int fd, struct display *d)
                 sdr.uid = -1;
                 if (!*++ap)
                     goto miss;
-                if (**ap == '=') {
-                    switch (setBootOption(*ap + 1, &sdr)) {
-                    case BO_NOMAN:
-                        fLog(d, fd, "notsup", "boot options unavailable");
-                        goto bust;
-                    case BO_NOENT:
-                        fLog(d, fd, "noent", "no such boot option");
-                        goto bust;
-                    case BO_IO:
-                        fLog(d, fd, "io", "io error");
-                        goto bust;
-                    }
-                    if (!*++ap)
-                        goto miss;
-                }
                 sdr.start = strtol(*ap, &bp, 10);
                 if (bp != *ap && !*bp) {
                     if (**ap == '+') {
@@ -750,37 +733,6 @@ processCtrl(const char *string, int len, int fd, struct display *d)
                     sdRec = sdr;
                 }
             }
-        } else if (!strcmp(ar[0], "listbootoptions")) {
-            char **opts;
-            int def, cur, i, j;
-
-            if (ar[1])
-                goto exce;
-            switch (getBootOptions(&opts, &def, &cur)) {
-            case BO_NOMAN:
-                fLog(d, fd, "notsup", "boot options unavailable");
-                goto bust;
-            case BO_IO:
-                fLog(d, fd, "io", "io error");
-                goto bust;
-            }
-            Reply("ok\t");
-            for (i = 0; opts[i]; i++) {
-                bp = cbuf;
-                if (i)
-                    *bp++ = ' ';
-                for (j = 0; opts[i][j]; j++)
-                    if (opts[i][j] == ' ') {
-                        *bp++ = '\\';
-                        *bp++ = 's';
-                    } else {
-                        *bp++ = opts[i][j];
-                    }
-                writer(fd, cbuf, bp - cbuf);
-            }
-            freeStrArr(opts);
-            writer(fd, cbuf, sprintf(cbuf, "\t%d\t%d\n", def, cur));
-            goto bust;
         } else if (d) {
             if (!strcmp(ar[0], "lock")) {
                 if (ar[1])

diff --git a/kdm/backend/dm.c b/kdm/backend/dm.c
index 20ec18a..5fc20e9 100644 (file)
--- a/kdm/backend/dm.c
+++ b/kdm/backend/dm.c
@@ -315,7 +315,6 @@ main(int argc, char **argv)
     closeCtrl(0);
     if (sdRec.how) {
         int pid;
-        commitBootOption();
         if (Fork(&pid) <= 0) {
             char *cmd = sdRec.how == SHUT_HALT ? cmdHalt : cmdReboot;
             execute(parseArgs((char **)0, cmd), (char **)0);
@@ -847,25 +846,12 @@ processGPipe(struct display *d)
         return;
     }
     switch (cmd) {
-    case G_ListBootOpts:
-        ret = getBootOptions(&opts, &dflt, &curr);
-        gSendInt(ret);
-        if (ret == BO_OK) {
-            gSendArgv(opts);
-            freeStrArr(opts);
-            gSendInt(dflt);
-            gSendInt(curr);
-        }
-        break;
     case G_Shutdown:
         sdRec.how = gRecvInt();
         sdRec.start = gRecvInt();
         sdRec.timeout = gRecvInt();
         sdRec.force = gRecvInt();
         sdRec.uid = gRecvInt();
-        option = gRecvStr();
-        setBootOption(option, &sdRec);
-        free(option);
         break;
     case G_QueryShutdown:
         gSendInt(sdRec.how);

diff --git a/kdm/backend/dm.h b/kdm/backend/dm.h
index 61e27ea..45a76e8 100644 (file)
--- a/kdm/backend/dm.h
+++ b/kdm/backend/dm.h
@@ -611,11 +611,6 @@ int iniSave(const char *data, const char *fname);
 char *iniEntry(char *data, const char *section, const char *key, const char *value);
 char *iniMerge(char *data, const char *newdata);
 
-/* in bootman.c */
-int getBootOptions(char ***opts, int *def, int *cur);
-int setBootOption(const char *opt, SdRec *sdr);
-void commitBootOption(void);
-
 /* in netaddr.c */
 CARD8 *netaddrAddress(char *netaddrp, int *lenp);
 CARD8 *netaddrPort(char *netaddrp, int *lenp);

diff --git a/kdm/backend/greet.h b/kdm/backend/greet.h
index 2ef7026..5bfc2a6 100644 (file)
--- a/kdm/backend/greet.h
+++ b/kdm/backend/greet.h
@@ -177,11 +177,6 @@ from the copyright holder.
 # define isTTY            2
 #define G_QueryShutdown 112 /* ; 5*int; string */
 #define G_Activate      113 /* int vt; async */
-#define G_ListBootOpts  114 /* ; int sts, [argv opts, int dflt, int cur] */
-# define BO_OK      0
-# define BO_NOMAN  -1
-# define BO_NOENT  -2
-# define BO_IO     -3
 #define G_Console       116 /* ; async */
 #define G_AutoLogin     117 /* ; async */
 #define G_QryDpyShutdown 118 /* ; int, int, str */

diff --git a/kdm/config.def b/kdm/config.def
index c0483f4..279c6e3 100644 (file)
--- a/kdm/config.def
+++ b/kdm/config.def
@@ -1234,24 +1234,6 @@ Description:
  </para><para>
  This will have no effect unless <option>AllowFifo</option> is enabled.
 
-Key: BootManager
-Type: enum
- None/BO_NONE: no boot manager
- Grub/BO_GRUB: Grub boot manager
- Grub2/BO_GRUB2: Grub2 boot manager
- Burg/BO_BURG: Burg boot manager
- Lilo/BO_LILO: Lilo boot manager (Linux on i386 &amp; x86-64 only)
-Default: None
-User: core
-User: greeter
-Instance: #Grub
-Merge: kdm:UseLilo(P_UseLilo)
-Comment: &
-Description:
- The boot manager &kdm; should use for offering boot options in the
- shutdown dialog.
-
-
 Section: -Core
 Description:
  This section class contains options concerning the configuration

diff --git a/kdm/kcm/kdm-shut.cpp b/kdm/kcm/kdm-shut.cpp
index 47f3060..4b14d13 100644 (file)
--- a/kdm/kcm/kdm-shut.cpp
+++ b/kdm/kcm/kdm-shut.cpp
@@ -91,36 +91,15 @@ KDMSessionsWidget::KDMSessionsWidget(QWidget *parent)
     restart_label->setWhatsThis(wtstr);
     restart_lined->setWhatsThis(wtstr);
 
-
-    QGroupBox *group4 = new QGroupBox(i18nc("@title:group", "Miscellaneous"), this);
-
-    bm_combo = new KBackedComboBox(group4);
-    bm_combo->insertItem("None", i18nc("boot manager", "None"));
-    bm_combo->insertItem("Grub", i18n("Grub"));
-    bm_combo->insertItem("Grub2", i18n("Grub2"));
-    bm_combo->insertItem("Burg", i18n("Burg"));
-#if defined(Q_OS_LINUX) && (defined(QT_ARCH_I386) || defined(QT_ARCH_X86_64))
-    bm_combo->insertItem("Lilo", i18n("Lilo"));
-#endif
-    QLabel *bm_label = new QLabel(i18n("Boot manager:"), group4);
-    bm_label->setBuddy(bm_combo);
-    connect(bm_combo, SIGNAL(activated(int)), SIGNAL(changed()));
-    wtstr = i18n("Enable boot options in the \"Shutdown...\" dialog.");
-    bm_label->setWhatsThis(wtstr);
-    bm_combo->setWhatsThis(wtstr);
-
     QBoxLayout *main = new QVBoxLayout(this);
     main->setMargin(10);
     QGridLayout *lgroup0 = new QGridLayout(group0);
     lgroup0->setSpacing(10);
     QGridLayout *lgroup1 = new QGridLayout(group1);
     lgroup1->setSpacing(10);
-    QGridLayout *lgroup4 = new QGridLayout(group4);
-    lgroup4->setSpacing(10);
 
     main->addWidget(group0);
     main->addWidget(group1);
-    main->addWidget(group4);
     main->addStretch();
 
     lgroup0->setColumnMinimumWidth(2, KDialog::spacingHint() * 2);
@@ -139,10 +118,6 @@ KDMSessionsWidget::KDMSessionsWidget(QWidget *parent)
     lgroup1->addWidget(restart_label, 1, 3);
     lgroup1->addWidget(restart_lined, 1, 4);
 
-    lgroup4->addWidget(bm_label, 1, 0);
-    lgroup4->addWidget(bm_combo, 1, 1);
-    lgroup4->setColumnStretch(2, 1);
-
     main->activate();
 
 }
@@ -167,8 +142,6 @@ void KDMSessionsWidget::save()
     KConfigGroup configGrp = config->group("Shutdown");
     configGrp.writeEntry("HaltCmd", shutdown_lined->url().path(), KConfig::Persistent);
     configGrp.writeEntry("RebootCmd", restart_lined->url().path(), KConfig::Persistent);
-
-    configGrp.writeEntry("BootManager", bm_combo->currentId());
 }
 
 void KDMSessionsWidget::readSD(KComboBox *combo, const QString &def, KConfigGroup group)
@@ -193,8 +166,6 @@ void KDMSessionsWidget::load()
     KConfigGroup configGrp = config->group("Shutdown");
     restart_lined->setUrl(configGrp.readEntry("RebootCmd", REBOOT_CMD));
     shutdown_lined->setUrl(configGrp.readEntry("HaltCmd", HALT_CMD));
-
-    bm_combo->setCurrentId(configGrp.readEntry("BootManager", "None"));
 }
 
 void KDMSessionsWidget::defaults()
@@ -204,8 +175,6 @@ void KDMSessionsWidget::defaults()
 
     sdlcombo->setCurrentIndex(SdAll);
     sdrcombo->setCurrentIndex(SdRoot);
-
-    bm_combo->setCurrentId("None");
 }
 
 #include "moc_kdm-shut.cpp"

diff --git a/kdm/kcm/kdm-shut.h b/kdm/kcm/kdm-shut.h
index 3b8c377..d03dd6c 100644 (file)
--- a/kdm/kcm/kdm-shut.h
+++ b/kdm/kcm/kdm-shut.h
@@ -51,7 +51,6 @@ class KDMSessionsWidget : public QWidget {
     KComboBox *sdlcombo, *sdrcombo;
     QLabel *sdllabel, *sdrlabel;
     KUrlRequester *restart_lined, *shutdown_lined;
-    KBackedComboBox *bm_combo;
 };
 
 #endif

diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp
index 1c766cb..e43db53 100644 (file)
--- a/kdm/kfrontend/kdmshutdown.cpp
+++ b/kdm/kfrontend/kdmshutdown.cpp
@@ -235,23 +235,6 @@ doShutdown(int type, const QString &os)
     gSet(0);
 }
 
-
-static bool
-getBootOptions(QStringList *options, int *defaultTarget, int *oldTarget)
-{
-    bool ret = false;
-    gSet(1);
-    gSendInt(G_ListBootOpts);
-    if (gRecvInt() == BO_OK) {
-        *options = qStringList(gRecvStrArr(0));
-        *defaultTarget = gRecvInt();
-        *oldTarget = gRecvInt();
-        ret = true;
-    }
-    gSet(0);
-    return ret;
-}
-
 KDMShutdown::KDMShutdown(int _uid, QWidget *_parent)
     : inherited(_uid, _parent)
 {
@@ -270,28 +253,9 @@ KDMShutdown::KDMShutdown(int _uid, QWidget *_parent)
 
     restart_rb = new KDMRadioButton(i18n("&Restart computer"), howGroup);
 
-    QBoxLayout *hwlay = new QVBoxLayout(howGroup);
-    hwlay->addWidget(rb);
-    hwlay->addWidget(restart_rb);
-
     connect(rb, SIGNAL(doubleClicked()), SLOT(accept()));
     connect(restart_rb, SIGNAL(doubleClicked()), SLOT(accept()));
 
-    QStringList options;
-    int defaultTarget;
-    if (getBootOptions(&options, &defaultTarget, &oldTarget)) { /* XXX show dialog on failure */
-        targets = new QComboBox();
-        targets->addItems(options);
-        targets->setCurrentIndex(oldTarget == -1 ? defaultTarget : oldTarget);
-        QHBoxLayout *hb = new QHBoxLayout();
-        hwlay->addLayout(hb);
-        hb->addSpacing(
-            style()->pixelMetric(QStyle::PM_ExclusiveIndicatorWidth)
-            + hb->spacing());
-        hb->addWidget(targets);
-        connect(targets, SIGNAL(activated(int)), SLOT(slotTargetChanged()));
-    }
-
     howGroup->setSizePolicy(fp);
 
     schedGroup = new QGroupBox(i18nc("@title:group ... of shutdown", "Scheduling"), this);
@@ -371,12 +335,6 @@ KDMShutdown::accept()
 }
 
 void
-KDMShutdown::slotTargetChanged()
-{
-    restart_rb->setChecked(true);
-}
-
-void
 KDMShutdown::slotWhenChanged()
 {
     doesNuke = cb_force->isChecked();
@@ -393,9 +351,6 @@ KDMShutdown::accepted()
     gSendInt(sch_to);
     gSendInt(cb_force->isChecked() ? SHUT_FORCE : SHUT_CANCEL);
     gSendInt(_allowShutdown == SHUT_ROOT ? 0 : -2);
-    gSendStr((restart_rb->isChecked() &&
-              targets && targets->currentIndex() != oldTarget) ?
-             targets->currentText().toLocal8Bit().data() : 0);
     gSet(0);
     inherited::accepted();
 }
@@ -439,25 +394,6 @@ KDMRadioButton::mouseDoubleClickEvent(QMouseEvent *)
     emit doubleClicked();
 }
 
-
-KDMDelayedPushButton::KDMDelayedPushButton(const KGuiItem &item, QWidget *parent)
-    : inherited(item, parent)
-{
-    popt.setSingleShot(true);
-    popt.setInterval(style()->styleHint(QStyle::SH_ToolButton_PopupDelay, 0, this));
-}
-
-void KDMDelayedPushButton::setDelayedMenu(QMenu *p)
-{
-    setMenu(p);
-    disconnect(this, 0, this, 0); // Internal button -> popup connection
-    if (p) {
-        connect(this, SIGNAL(pressed()), &popt, SLOT(start()));
-        connect(this, SIGNAL(released()), &popt, SLOT(stop()));
-        connect(&popt, SIGNAL(timeout()), SLOT(showMenu()));
-    }
-}
-
 KDMSlimShutdown::KDMSlimShutdown(QWidget *_parent)
     : inherited(_parent)
 {
@@ -482,24 +418,11 @@ KDMSlimShutdown::KDMSlimShutdown(QWidget *_parent)
 
     buttonlay->addSpacing(KDialog::spacingHint());
 
-    KDMDelayedPushButton *btnReboot = new
-    KDMDelayedPushButton(KGuiItem(i18n("&Restart Computer"), "system-reboot"), this);
+    KPushButton *btnReboot = new
+    KPushButton(KGuiItem(i18n("&Restart Computer"), "system-reboot"), this);
     buttonlay->addWidget(btnReboot);
     connect(btnReboot, SIGNAL(clicked()), SLOT(slotReboot()));
 
-    int dummy, cur;
-    if (getBootOptions(&targetList, &dummy, &cur)) {
-        QMenu *targets = new QMenu(this);
-        for (int i = 0; i < targetList.size(); i++)
-            (targets->addAction(i == cur ?
-                                i18nc("current option in boot loader",
-                                      "%1 (current)", targetList[i]) :
-                                targetList[i]))->setData(i);
-        btnReboot->setDelayedMenu(targets);
-        connect(targets, SIGNAL(triggered(QAction*)),
-                SLOT(slotReboot(QAction*)));
-    }
-
     buttonlay->addStretch(1);
 
     if (_scheduledSd != SHUT_NEVER) {

diff --git a/kdm/kfrontend/kdmshutdown.h b/kdm/kfrontend/kdmshutdown.h
index 8601bbf..ac9f744 100644 (file)
--- a/kdm/kfrontend/kdmshutdown.h
+++ b/kdm/kfrontend/kdmshutdown.h
@@ -106,7 +106,6 @@ class KDMShutdown : public KDMShutdownBase {
     virtual void accepted();
 
   private Q_SLOTS:
-    void slotTargetChanged();
     void slotWhenChanged();
 
   private:
@@ -115,7 +114,6 @@ class KDMShutdown : public KDMShutdownBase {
     QRadioButton *restart_rb;
     QLineEdit *le_start, *le_timeout;
     QCheckBox *cb_force;
-    QComboBox *targets;
     int oldTarget;
     int sch_st, sch_to;
 
@@ -136,18 +134,6 @@ class KDMRadioButton : public QRadioButton {
 
 };
 
-class KDMDelayedPushButton : public KPushButton {
-    Q_OBJECT
-    typedef KPushButton inherited;
-
-  public:
-    KDMDelayedPushButton(const KGuiItem &item, QWidget *parent);
-    void setDelayedMenu(QMenu *pop);
-
-  private:
-    QTimer popt;
-};
-
 class KDMSlimShutdown : public FDialog {
     Q_OBJECT
     typedef FDialog inherited;