← Back to branch summary

~ubuntu-branches/ubuntu/karmic/gimp/karmic-updates

« back to all changes in this revision

Viewing changes to plug-ins/common/file-svg.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2009-08-31 10:24:10 UTC
  • mfrom: (1.1.21 upstream) (0.1.5 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090831102410-eqawgw6fhdyi91ee
Tags: 2.6.7-1ubuntu1
https://launchpad.net/bugs/419593
* Merge with Debian unstable (LP: #419593), remaining changes:
  - 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.
* debian/patches/01_debian-gimprc.patch:
  - Updated
* debian/control:
  - Added a BZR link

Show diffs side-by-side

added added

removed removed

Lines of Context:
plug-ins/common/file-svg.c
650
650
  if (!load_rsvg_size (filename, &vals, NULL))
651
651
    return;
652
652
 
 
653
  g_signal_handlers_block_by_func (size, load_dialog_size_callback, NULL);
 
654
 
 
655
  gimp_size_entry_set_resolution (size, 0, load_vals.resolution, FALSE);
 
656
  gimp_size_entry_set_resolution (size, 1, load_vals.resolution, FALSE);
 
657
 
 
658
  g_signal_handlers_unblock_by_func (size, load_dialog_size_callback, NULL);
 
659
 
 
660
  if (gimp_size_entry_get_unit (size) != GIMP_UNIT_PIXEL)
 
661
    {
 
662
      ratio_x = gimp_size_entry_get_refval (size, 0) / vals.width;
 
663
      ratio_y = gimp_size_entry_get_refval (size, 1) / vals.height;
 
664
    }
 
665
 
653
666
  svg_width  = vals.width;
654
667
  svg_height = vals.height;
655
668