← Back to branch summary

~ubuntu-branches/ubuntu/saucy/xscreensaver/saucy

« back to all changes in this revision

Viewing changes to hacks/glx/sballs.c

  • Committer: Bazaar Package Importer
  • Author(s): Ted Gould
  • Date: 2008-06-17 09:41:41 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20080617094141-0un910o2mu76ei4l
Tags: 5.05-1ubuntu1
* Added 70_demo_gtk_stfu_removal.patch to remove some more cases where
  the STFU macro is used such that when the #defines it's used on change
  the compile breaks.  Bad coding style.
* Removing 82_ubuntu-texturl-fridge.patch in favor of updating the
  53_XScreenSaver.ad.in.patch to include the Ubuntu branding instead
  of the Debian branding.  This should make merges easier as long as
  we use something smart like Bazaar.  Also the Debian version has lots
  of good changes like making it work with /etc/alternates which we
  didn't have.
* Removing 54_driver_demogtk.patch as it was merged upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hacks/glx/sballs.c
798
798
    }
799
799
  else if (event->xany.type == ButtonPress &&
800
800
           (event->xbutton.button == Button4 ||
801
 
            event->xbutton.button == Button5))
 
801
            event->xbutton.button == Button5 ||
 
802
            event->xbutton.button == Button6 ||
 
803
            event->xbutton.button == Button7))
802
804
    {
803
805
      gltrackball_mousewheel (sb->trackball, event->xbutton.button, 5,
804
806
                              !!event->xbutton.state);