← Back to branch summary

~ubuntu-branches/ubuntu/utopic/xscreensaver/utopic

« back to all changes in this revision

Viewing changes to hacks/noseguy.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/noseguy.c
70
70
static int think (struct state *);
71
71
static unsigned long look (struct state *); 
72
72
 
73
 
#define FROM_ARGV    1
74
 
#define FROM_PROGRAM 2
75
 
#define FROM_FILE    3
76
 
#define FROM_RESRC   4
77
 
 
78
73
#define IS_MOVING  1
79
 
#define GET_PASSWD 2
80
74
 
81
75
#if defined(HAVE_GDK_PIXBUF) || defined(HAVE_XPM)
82
76
# include "images/noseguy/nose-f1.xpm"