← Back to branch summary

~ubuntu-branches/ubuntu/precise/kde-workspace/precise-security

« back to all changes in this revision

Viewing changes to kdm/backend/choose.c

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Scott Kitterman, Jonathan Riddell
  • Date: 2012-09-07 18:06:44 UTC
  • mfrom: (0.1.1) (1.1.14)
  • mto: This revision was merged to the branch mainline in revision 44.
  • Revision ID: package-import@ubuntu.com-20120907180644-ye0r2bakv7nsd4tl
Tags: 4:4.8.5-0ubuntu0.1
https://launchpad.net/bugs/1047417
[ Scott Kitterman ]
* New upstream bugfix release (LP: #1047417)
   - Drop patches previously cherrypicked from upstream:
      Remove_second_invisible_ProcessTable_widget.patch
      Fix_regression_that_you_couldnt_add_new_beams.patch
      Prevent_user_from_hiding_all_columns.patch
      observe_polkit_privileges_with_CanSuspend_CanResume.diff

[ Jonathan Riddell ]
* Add kde-workspace_4.8.5.orig-ksplash.tar.gz with ariya theme
  which was missed from tar by upsteram
* Add kubuntu_remove_horos_ksplash_theme.diff to remove horos theme

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: