← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kde-workspace/quantal

« back to all changes in this revision

Viewing changes to kdm/backend/session.c

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-07-26 17:32:34 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20120726173234-bsn4gwllpbcwu2r4
Tags: 4:4.9.0-0ubuntu1
* Use direct build-depends versions rather than kde-sc-dev-latest
* Remove patches/kubuntu_revert_1554ba408633397066d31c3d565c217b5a385fb8.diff fixed upstream
* Remove debian/patches/kubuntu_fix_batterymonitor_panel_minsize.diff fix upstream
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
kdm/backend/session.c
233
233
GTalk mstrtalk;
234
234
 
235
235
int
236
 
ctrlGreeterWait(int wreply)
 
236
ctrlGreeterWait(int wreply, time_t *startTime)
237
237
{
238
238
    int i, cmd, type, rootok;
239
239
    char *name, *pass;
247
247
        case G_Ready:
248
248
            debug("G_Ready\n");
249
249
            return 0;
 
250
        case G_Interact:
 
251
            if (startTime)
 
252
                *startTime = 0;
 
253
            break;
250
254
        case G_GetCfg:
251
255
            /*debug("G_GetCfg\n");*/
252
256
            type = gRecvInt();
437
441
              greeterUID, td->greeterAuthFile, &td->gpipe))
438
442
        sessionExit(EX_UNMANAGE_DPY);
439
443
    freeStrArr(env);
440
 
    if ((cmd = ctrlGreeterWait(True))) {
 
444
    if ((cmd = ctrlGreeterWait(True, 0))) {
441
445
        logError("Received unknown or unexpected command %d from greeter\n", cmd);
442
446
        closeGreeter(True);
443
447
        sessionExit(EX_UNMANAGE_DPY);
569
573
 
570
574
#ifdef XDMCP
571
575
    if (td->useChooser)
572
 
        doChoose();
 
576
        doChoose(0);
573
577
        /* NOTREACHED */
574
578
#endif
575
579
 
595
599
                      (tdiff > 0 || td->autoAgain)) ?
596
600
                          G_GreetTimed : G_Greet);
597
601
          gcont:
598
 
            cmd = ctrlGreeterWait(True);
599
 
            if (cmd == G_Interact) {
600
 
                startt = 0;
601
 
                goto gcont;
602
 
            }
 
602
            cmd = ctrlGreeterWait(True, &startt);
603
603
#ifdef XDMCP
604
604
            while (cmd == G_DChoose) {
605
605
              choose:
606
 
                cmd = doChoose();
 
606
                cmd = doChoose(&startt);
607
607
            }
608
608
            if (cmd == G_DGreet)
609
609
                continue;
672
672
        resetXProperties();
673
673
        openGreeter();
674
674
        gSendInt(G_ConfShutdown);
675
 
        if ((cmd = ctrlGreeterWait(True)) != G_Ready) {
 
675
        if ((cmd = ctrlGreeterWait(True, 0)) != G_Ready) {
676
676
            logError("Received unknown command %d from greeter\n", cmd);
677
677
            closeGreeter(True);
678
678
        }