← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xscreensaver/trusty

« back to all changes in this revision

Viewing changes to hacks/phosphor.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-11-30 13:33:13 UTC
  • mfrom: (1.1.8 upstream) (2.1.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091130133313-3b5nz2e7hvbb8h3l
Tags: 5.10-3ubuntu1
https://launchpad.net/bugs/489062
* Merge with Debian unstable, remaining changes: (LP: #489062)
  - debian/control: add Build-Depends on ubuntu-artwork
  - debian/rules: use /usr/share/backgrounds
  - debian/control: Move xli | xloadimage recommends to suggests
  - debian/split-hacks.config: Use different set of default hacks to Debian
  - debian/source_xscreensaver.py: Add apport hook
  - debian/patches/53_XScreenSaver.ad.in.patch: Use Ubuntu branding

Show diffs side-by-side

added added

removed removed

Lines of Context:
hacks/phosphor.c
1
 
/* xscreensaver, Copyright (c) 1999-2008 Jamie Zawinski <jwz@jwz.org>
 
1
/* xscreensaver, Copyright (c) 1999-2009 Jamie Zawinski <jwz@jwz.org>
2
2
 *
3
3
 * Permission to use, copy, modify, distribute, and sell this software and its
4
4
 * documentation for any purpose is hereby granted without fee, provided that
1354
1354
            {
1355
1355
              waitpid(state->pid, NULL, 0);
1356
1356
              fclose (state->pipe);
 
1357
              state->pid = 0;
1357
1358
            }
1358
1359
          else
1359
1360
            {
1436
1437
  resize_grid (state);
1437
1438
 
1438
1439
# if defined(HAVE_FORKPTY) && defined(TIOCSWINSZ)
1439
 
  if (state->pid)
 
1440
  if (state->pid && state->pipe)
1440
1441
    {
1441
1442
      /* Tell the sub-process that the screen size has changed. */
1442
1443
      struct winsize ws;