← Back to branch summary

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

« back to all changes in this revision

Viewing changes to kdm/backend/choose.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/choose.c
849
849
#define PING_TRIES 3
850
850
 
851
851
int
852
 
doChoose()
 
852
doChoose(time_t *startTime)
853
853
{
854
854
    HostName **hp, *h;
855
855
    char *host, **hostp;
860
860
 
861
861
    openGreeter();
862
862
    gSendInt(G_Choose);
863
 
    switch (cmd = ctrlGreeterWait(True)) {
 
863
    switch (cmd = ctrlGreeterWait(True, startTime)) {
864
864
    case G_Ready:
865
865
        break;
866
866
    default: /* error */
943
943
#endif
944
944
        if (select(n + 1, &rfds, 0, 0, to) > 0) {
945
945
            if (FD_ISSET(grtproc.pipe.fd.r, &rfds))
946
 
                switch (cmd = ctrlGreeterWait(False)) {
 
946
                switch (cmd = ctrlGreeterWait(False, startTime)) {
947
947
                case -1:
948
948
                    break;
949
949
                case G_Ch_Refresh: