← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gimp/vivid-proposed

« back to all changes in this revision

Viewing changes to app/tools/gimpfreeselecttool.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-08 13:26:03 UTC
  • mfrom: (1.1.28) (0.4.19 sid)
  • Revision ID: package-import@ubuntu.com-20130308132603-h14fmrgazi3roobr
Tags: 2.8.4-1ubuntu1
https://launchpad.net/bugs/1132767
* Synchronize with Debian (LP: #1132767). Remaining changes:
  - debian/patches/02_help-message.patch,
    debian/patches/03_gimp.desktop.in.in.patch:
    + Update some strings for Ubuntu
  - debian/control:
    + Update description
  - debian/rules:
    + Set gettext domain and update translation templates
* Dropped changes:
  - CVE-2012-5576.patch: Applied in new version
  - fix-python-multiarch-includes.patch: No longer needed
* debian/patches/link-against-lm.patch:
  - Link against lm to fix underlinking build failure
* debian/control, debian/rules:
  - Run autoreconf for above patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/tools/gimpfreeselecttool.c
1385
1385
    {
1386
1386
      gimp_draw_tool_pause (draw_tool);
1387
1387
 
1388
 
      priv->constrain_angle = state & (gimp_get_constrain_behavior_mask () ?
1389
 
                                       TRUE : FALSE);
 
1388
      priv->constrain_angle = ((state & gimp_get_constrain_behavior_mask ()) ?
 
1389
                               TRUE : FALSE);
1390
1390
 
1391
1391
      priv->supress_handles = state & GDK_SHIFT_MASK ? TRUE : FALSE;
1392
1392
 
1415
1415
 
1416
1416
  gimp_draw_tool_pause (draw_tool);
1417
1417
 
1418
 
  priv->constrain_angle = state & (gimp_get_constrain_behavior_mask () ?
1419
 
                                   TRUE : FALSE);
 
1418
  priv->constrain_angle = ((state & gimp_get_constrain_behavior_mask ()) ?
 
1419
                           TRUE : FALSE);
1420
1420
 
1421
1421
  /* If we didn't came here due to a mouse release, immediately update
1422
1422
   * the position of the thing we move.