gimp r27721 - in branches/gimp-2-6: . app/dialogs

[martinn svn gnome org]

Author: martinn
Date: Wed Nov 26 19:18:37 2008
New Revision: 27721
URL: http://svn.gnome.org/viewvc/gimp?rev=27721&view=rev

Log:
Merged from trunk:

Bug 562366 â Default image dimensions are not correctly
transferred in the file/new dialog box

* app/dialogs/preferences-dialog.c
(prefs_template_select_callback): We need to copy the template in
the same way as in the New Image dialog.


Modified:
   branches/gimp-2-6/ChangeLog
   branches/gimp-2-6/app/dialogs/preferences-dialog.c

Modified: branches/gimp-2-6/app/dialogs/preferences-dialog.c
==============================================================================
--- branches/gimp-2-6/app/dialogs/preferences-dialog.c	(original)
+++ branches/gimp-2-6/app/dialogs/preferences-dialog.c	Wed Nov 26 19:18:37 2008
@@ -425,7 +425,13 @@
                                 GimpTemplate      *edit_template)
 {
   if (template)
-    gimp_config_sync (G_OBJECT (template), G_OBJECT (edit_template), 0);
+    {
+      /*  make sure the resolution values are copied first (see bug #546924)  */
+      gimp_config_sync (G_OBJECT (template), G_OBJECT (edit_template),
+                        GIMP_TEMPLATE_PARAM_COPY_FIRST);
+      gimp_config_sync (G_OBJECT (template), G_OBJECT (edit_template),
+                        0);
+    }
 }
 
 static void