← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gimp/trusty

« back to all changes in this revision

Viewing changes to app/tools/gimpiscissorstool.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2008-03-07 14:25:30 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20080307142530-sac8ls41holrlwg1
Tags: 2.4.5-1ubuntu1
https://launchpad.net/bugs/197708
https://launchpad.net/bugs/189758
* Merge from Debian unstable. (LP: #197708)
* Ubuntu remaining changes:
  - 02_help-message.patch, 03_gimp.desktop.in.in.patch: Distro changes.
  - Weave i18n magic in the rules file.
  - Remove the doc directory symlink in the preinst, and replace it with a
    directory.
  - Modify Maintainer value to match Debian-Maintainer-Field Spec
* Re-adds missing 03_gimp.desktop.in.in.patch. (LP: #189758)
* Most of the work done by Pedro Fragoso.

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/tools/gimpiscissorstool.c
1053
1053
 
1054
1054
  switch (kevent->keyval)
1055
1055
    {
 
1056
    case GDK_Return:
1056
1057
    case GDK_KP_Enter:
1057
 
    case GDK_Return:
 
1058
    case GDK_ISO_Enter:
1058
1059
      if (iscissors->connected && iscissors->mask)
1059
1060
        {
1060
1061
          gimp_iscissors_tool_apply (iscissors, display);