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

[martinn svn gnome org]

Author: martinn
Date: Thu Nov 27 07:28:38 2008
New Revision: 27725
URL: http://svn.gnome.org/viewvc/gimp?rev=27725&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.

* app/dialogs/image-new-dialog.c (image_new_dialog_set): ... and
when we copy the template to the New Image dialog.


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

Modified: branches/gimp-2-6/app/dialogs/image-new-dialog.c
==============================================================================
--- branches/gimp-2-6/app/dialogs/image-new-dialog.c	(original)
+++ branches/gimp-2-6/app/dialogs/image-new-dialog.c	Thu Nov 27 07:28:38 2008
@@ -187,7 +187,11 @@
       template = gimp_image_new_get_last_template (dialog->context->gimp,
                                                    image);
 
-      gimp_config_sync (G_OBJECT (template), G_OBJECT (dialog->template), 0);
+      /*  make sure the resolution values are copied first (see bug #546924)  */
+      gimp_config_sync (G_OBJECT (template), G_OBJECT (dialog->template),
+                        GIMP_TEMPLATE_PARAM_COPY_FIRST);
+      gimp_config_sync (G_OBJECT (template), G_OBJECT (dialog->template),
+                        0);
 
       g_object_unref (template);
     }