← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gimp/oneiric-security

« back to all changes in this revision

Viewing changes to app/display/gimpdisplayshell-draw.c

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2008-11-24 14:16:39 UTC
  • mfrom: (1.1.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20081124141639-12b1g29vvadd5pzp
Tags: 2.6.3-1ubuntu1
https://launchpad.net/bugs/301724
* Sync with Debian experimental (LP: #301724)
* debian/patches/02_help-message.patch,
  debian/patches/03_gimp.desktop.in.in.patch:
  - updated some strings for ubuntu
* debian/rules:
  - updated translation templates
* debian/control:
  - Drop webkit build dependency. gimp is the only thing pulling
    in webkit for the desktop CDs, and makes them explode
    Without the webkit help browser
    plugin, help will just be displayed in the default browser.

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/display/gimpdisplayshell-draw.c
573
573
  if (! shell->display->image)
574
574
    return;
575
575
 
576
 
  gimp_display_shell_scroll_get_scaled_viewport_offset (shell, &sx, &sy);
 
576
  sx = - shell->offset_x;
 
577
  sy = - shell->offset_y;
 
578
 
577
579
  gimp_display_shell_draw_get_scaled_image_size (shell, &sw, &sh);
578
580
 
579
581
  /*  check if the passed in area intersects with