← Back to branch summary

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

« back to all changes in this revision

Viewing changes to app/dialogs/image-new-dialog.c

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2009-02-10 16:46:38 UTC
  • mfrom: (1.1.18 upstream)
  • Revision ID: james.westby@ubuntu.com-20090210164638-tyrazsf2bcncjnz0
Tags: 2.6.4-1ubuntu1
https://launchpad.net/bugs/313354
* Merge with Debian Experimental (LP: #313354)
* Ubuntu 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/dialogs/image-new-dialog.c
187
187
      template = gimp_image_new_get_last_template (dialog->context->gimp,
188
188
                                                   image);
189
189
 
190
 
      gimp_config_sync (G_OBJECT (template), G_OBJECT (dialog->template), 0);
 
190
      /*  make sure the resolution values are copied first (see bug #546924)  */
 
191
      gimp_config_sync (G_OBJECT (template), G_OBJECT (dialog->template),
 
192
                        GIMP_TEMPLATE_PARAM_COPY_FIRST);
 
193
      gimp_config_sync (G_OBJECT (template), G_OBJECT (dialog->template),
 
194
                        0);
191
195
 
192
196
      g_object_unref (template);
193
197
    }