← Back to branch summary

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

« back to all changes in this revision

Viewing changes to app/tools/gimpmovetool.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/tools/gimpmovetool.c
453
453
    }
454
454
  else
455
455
    {
 
456
      gboolean flush = FALSE;
 
457
 
456
458
      if (! config->move_tool_changes_active ||
457
459
          (release_type == GIMP_BUTTON_RELEASE_CANCEL))
458
460
        {
461
463
              gimp_image_set_active_layer (display->image,
462
464
                                           move->old_active_layer);
463
465
              move->old_active_layer = NULL;
 
466
 
 
467
              flush = TRUE;
464
468
            }
465
469
 
466
470
          if (move->old_active_vectors)
468
472
              gimp_image_set_active_vectors (display->image,
469
473
                                             move->old_active_vectors);
470
474
              move->old_active_vectors = NULL;
 
475
 
 
476
              flush = TRUE;
471
477
            }
472
478
        }
473
479
 
476
482
          if (move->floating_layer)
477
483
            {
478
484
              floating_sel_anchor (move->floating_layer);
479
 
              gimp_image_flush (display->image);
 
485
 
 
486
              flush = TRUE;
480
487
            }
481
488
        }
 
489
 
 
490
      if (flush)
 
491
        gimp_image_flush (display->image);
482
492
    }
483
493
}
484
494