← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/kubuntu_kdm_plymouth_transition.diff/kdm/backend/dm.h

  • 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:
.pc/kubuntu_kdm_plymouth_transition.diff/kdm/backend/dm.h
473
473
extern GProc grtproc;
474
474
void openGreeter(void);
475
475
int closeGreeter(int force);
476
 
int ctrlGreeterWait(int wreply);
 
476
int ctrlGreeterWait(int wreply, time_t *startTime);
477
477
void prepareErrorGreet(void);
478
478
void finishGreet(void);
479
479
char *conv_interact(int what, const char *prompt);
670
670
int checkIndirectChoice(ARRAY8Ptr clientAddress, ARRAY8Ptr clientPort, CARD16 connectionType);
671
671
void registerIndirectChoice(ARRAY8Ptr clientAddress, ARRAY8Ptr clientPort, CARD16 connectionType,
672
672
                            ARRAY8Ptr choice);
673
 
int doChoose(void);
 
673
int doChoose(time_t *startTime);
674
674
 
675
675
/* socket.c or streams.c */
676
676
void updateListenSockets(void);