← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/kdebase-workspace/gutsy

« back to all changes in this revision

Viewing changes to kdm/backend/choose.c

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2007-10-11 14:04:48 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20071011140448-v0eb7lxbb24zagca
Tags: 3.94.0-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
kdm/backend/choose.c
870
870
#else
871
871
                                gSendStr( inet_ntoa( *(struct in_addr *)h->hostaddr.data ) );
872
872
#endif
873
 
                                closeGreeter( FALSE );
874
873
                                sessionExit( EX_REMOTE );
875
874
                        } else {
876
875
                                gSendInt( D_ChooseHost );
877
876
                                gSendArr( td->clientAddr.length, (char *)td->clientAddr.data );
878
877
                                gSendInt( td->connectionType );
879
878
                                gSendArr( h->hostaddr.length, (char *)h->hostaddr.data );
880
 
                                closeGreeter( FALSE );
881
879
                                goto bout;
882
880
                        }
883
881
                        break;
900
898
        if ((td->displayType & d_location) == dLocal) {
901
899
                gSendInt( D_RemoteHost );
902
900
                gSendStr( name );
903
 
                closeGreeter( FALSE );
904
901
                sessionExit( EX_REMOTE );
905
902
        } else {
906
903
                gSendInt( D_ChooseHost );
907
904
                gSendArr( td->clientAddr.length, (char *)td->clientAddr.data );
908
905
                gSendInt( td->connectionType );
909
906
                gSendArr( hosts->addrlen, (char *)hosts->addr );
910
 
                closeGreeter( FALSE );
911
907
                sessionExit( EX_NORMAL );
912
908
        }
913
909
}
942
938
                /* XXX the config reader should do the lookup already */
943
939
                for (hostp = td->chooserHosts; *hostp; hostp++)
944
940
                        if (!registerForPing( *hostp ))
945
 
                                logError( "Unkown host %\"s specified for local chooser preload of display %s\n", *hostp, td->name );
 
941
                                logError( "Unknown host %\"s specified for local chooser preload of display %s\n", *hostp, td->name );
946
942
        } else
947
943
                forEachChooserHost( &td->clientAddr, td->connectionType,
948
944
                                    addChooserHost, 0 );