← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hacks/glx/topblock.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/glx/topblock.c
1
 
/* topblock, Copyright (c) 2006-2008
 
1
/* topblock, Copyright (c) 2006-2009
2
2
 *  rednuht <topblock.xscreensaver@jumpstation.co.uk>
3
3
 *
4
4
 * Permission to use, copy, modify, distribute, and sell this software and its
231
231
        dropSpeed = 80/dropSpeed;
232
232
        dropSpeed = (blockHeight/dropSpeed); 
233
233
 
234
 
  tb->glx_context = init_GL(mi);
235
 
 
236
234
  reshape_topBlock (mi, MI_WIDTH(mi), MI_HEIGHT(mi));
237
235
  if (0==1) {
238
236
      glClearColor(1.0f, 1.0f, 1.0f, 0.5f);