← Back to branch summary

~ubuntu-branches/ubuntu/feisty/xscreensaver/feisty

« back to all changes in this revision

Viewing changes to hacks/fontglide.c

  • Committer: Bazaar Package Importer
  • Author(s): Oliver Grawert
  • Date: 2006-06-30 16:27:21 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20060630162721-wwijraeyfkr0vh7m
Tags: 4.24-4ubuntu1
Merge from debian unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hacks/fontglide.c
284
284
  se->font = XLoadQueryFont (s->dpy, pattern);
285
285
  if (! se->font)
286
286
    {
287
 
      fprintf (stderr, "%s: unable to load font %s\n",
288
 
               progname, pattern);
 
287
      if (s->debug_p)
 
288
        fprintf (stderr, "%s: unable to load font %s\n",
 
289
                 progname, pattern);
289
290
      return False;
290
291
    }
291
292
 
325
326
  for (i = 0; i < 20; i++)
326
327
    if (pick_font_1 (s, se))
327
328
      return;
328
 
  fprintf (stderr, "%s: too many failures: giving up!\n", progname);
 
329
  fprintf (stderr, "%s: too many font-loading failures: giving up!\n", progname);
329
330
  exit (1);
330
331
}
331
332