kdm: remove unused process pointer and support for preloader

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

diff --git a/kdm/config.def b/kdm/config.def
index dcb643e..1fbbbf5 100644 (file)
--- a/kdm/config.def
+++ b/kdm/config.def
@@ -2628,18 +2628,6 @@ Comment: &
 Description:
  Show the <guilabel>Restart X Server</guilabel>/<guilabel>Close Connection</guilabel> action in the greeter.
 
-Key: Preloader
-Type: string
-Default: ""
-User: greeter-c
-Instance: */KDE_BINDIR "/preloadkde"
-Update: upd_preloader
-Comment: &
-Description:
- A program to run while the greeter is visible. It is supposed to preload
- as much as possible of the session that is going to be started (most
- probably).
-
 Key: Theme
 Type: string
 Default: ""

diff --git a/kdm/kfrontend/genkdmconf.c b/kdm/kfrontend/genkdmconf.c
index 33c5c8b..9f0a21b 100644 (file)
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
@@ -2279,18 +2279,6 @@ upd_sessionsdirs(Entry *ce, Section *cs ATTR_UNUSED)
     }
 }
 
-static void
-upd_preloader(Entry *ce, Section *cs ATTR_UNUSED)
-{
-    if (ce->written) { /* implies oldkde != 0 */
-        char *oldpl;
-        ASPrintf(&oldpl, "%s/bin/preloadkde", oldkdepfx);
-        if (!strcmp(ce->value, oldpl))
-            ce->value = (char *)KDE_BINDIR "/preloadkde";
-        free(oldpl);
-    }
-}
-
 
 CONF_GEN_ENTRIES
 

diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp
index c41075f..c108a8f 100644 (file)
--- a/kdm/kfrontend/kgapp.cpp
+++ b/kdm/kfrontend/kgapp.cpp
@@ -37,7 +37,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kcrash.h>
 #include <kglobalsettings.h>
 #include <kcomponentdata.h>
-#include <kprocess.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
 
@@ -397,7 +396,6 @@ main(void)
 
     setupModifiers(dpy, _numLockStatus);
     secureDisplay(dpy);
-    KProcess *proc = 0;
     if (!_grabServer) {
         gSendInt(G_SetupDpy);
         gRecvInt();
@@ -456,7 +454,6 @@ main(void)
             cmd = G_Greet;
         }
 
-        KProcess *proc2 = 0;
         app.markBusy();
         FDialog *dialog;
 #ifdef XDMCP
@@ -471,11 +468,6 @@ main(void)
                     _autoLoginUser.isEmpty())
                 _autoLoginDelay = 0;
             dialog = new KThemedGreeter(themer);
-            if (*_preloader) {
-                proc2 = new KProcess;
-                *proc2 << _preloader;
-                proc2->start();
-            }
         }
         QObject::connect(dialog, SIGNAL(ready()), &app, SLOT(markReady()));
         app.enableSendInteract();
@@ -483,7 +475,6 @@ main(void)
         rslt = dialog->exec();
         debug("left event loop\n");
         delete dialog;
-        delete proc2;
 #ifdef XDMCP
         switch (rslt) {
         case ex_greet:
@@ -501,7 +492,6 @@ main(void)
 
     KGVerify::done();
 
-    delete proc;
     delete themer;
 
     unsecureDisplay(dpy);