← Back to branch summary

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

« back to all changes in this revision

Viewing changes to driver/mlstring.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:
driver/mlstring.c
2
2
 * (c) 2007, Quest Software, Inc. All rights reserved.
3
3
 *
4
4
 * This file is part of XScreenSaver,
5
 
 * Copyright (c) 1993-2004 Jamie Zawinski <jwz@jwz.org>
 
5
 * Copyright (c) 1993-2009 Jamie Zawinski <jwz@jwz.org>
6
6
 *
7
7
 * Permission to use, copy, modify, distribute, and sell this software and its
8
8
 * documentation for any purpose is hereby granted without fee, provided that
153
153
          
154
154
          if (wrap_at == -1) /* No space found, hard wrap */
155
155
            wrap_at = line_length;
 
156
          else
 
157
            wrap_at++; /* Leave the space at the end of the line. */
156
158
 
157
159
          newml = calloc(1, sizeof(*newml));
158
160
          if (!newml) /* OOM, don't bother trying to wrap */