← Back to branch summary

~ubuntu-branches/ubuntu/wily/xscreensaver/wily

« back to all changes in this revision

Viewing changes to hacks/apple2.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-06-15 10:42:54 UTC
  • mfrom: (1.1.9 upstream) (2.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20100615104254-tio23up6qefk7rt1
Tags: 5.11-1ubuntu1
* Merge with Debian unstable, remaining Ubuntu changes:
* debian/control:
  - Build-Depend on ubuntu-artwork
  - Add Vcs-Bzr link
  - Move xli | xloadimage xscreensaver recommends to suggests
  - Add/Update replaces with Ubuntu versions
  - Update package descriptions to list Ubuntu screensavers
* debian/rules:
  - Use /usr/share/backgrounds as image directory
  - Add translation domain to .desktop files
* debian/source_xscreensaver.py: 
  - Add apport hook
* debian/split-hacks.config:
  - Use different set of default hacks to Debian
* debian/xscreensaver.dirs
  - Install /usr/share/backgrounds. By default, settings search in
    /usr/share/backgrounds and without it, it displays an error
* debian/patches/53_XScreenSaver.ad.in.patch:
  - Use Ubuntu branding
  - Updated new login command (newLoginCommand) to work with new GDM by
    truncating deprecated arguments to gdmflexiserver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hacks/apple2.c
1
 
/* xscreensaver, Copyright (c) 1998-2006 Jamie Zawinski <jwz@jwz.org>
 
1
/* xscreensaver, Copyright (c) 1998-2010 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
702
702
 
703
703
          XClearWindow(sim->dpy, sim->window);
704
704
 
705
 
          /* #### free sim? */
 
705
          /* free sim */
 
706
          /* This is from a2_make_font */
 
707
          free(sim->text_im->data);
 
708
          sim->text_im->data = 0;
 
709
          XDestroyImage(sim->text_im);
 
710
 
 
711
          /* And free else */
 
712
          analogtv_release(sim->dec);
 
713
          free(sim->st);
 
714
          free(sim->inp);
 
715
          free(sim);
 
716
 
706
717
          return 0;
707
718
        }
708
719