gimp r25306 - in trunk: . app/widgets

[mitch svn gnome org]

Author: mitch
Date: Sat Mar 29 22:29:55 2008
New Revision: 25306
URL: http://svn.gnome.org/viewvc/gimp?rev=25306&view=rev

Log:
2008-03-29  Michael Natterer  <mitch gimp org>

	* app/widgets/gimpmenudock.c (gimp_menu_dock_auto_clicked): when
	the "Auto" button gets enabled, always copy both display and image
	to the local context (because there can be displays without image
	now).



Modified:
   trunk/ChangeLog
   trunk/app/widgets/gimpmenudock.c

Modified: trunk/app/widgets/gimpmenudock.c
==============================================================================
--- trunk/app/widgets/gimpmenudock.c	(original)
+++ trunk/app/widgets/gimpmenudock.c	Sat Mar 29 22:29:55 2008
@@ -644,13 +644,9 @@
 
   if (menu_dock->auto_follow_active)
     {
-      if (gimp_context_get_display (dock->dialog_factory->context))
-        gimp_context_copy_property (dock->dialog_factory->context,
+      gimp_context_copy_properties (dock->dialog_factory->context,
                                     dock->context,
-                                    GIMP_CONTEXT_PROP_DISPLAY);
-      else
-        gimp_context_copy_property (dock->dialog_factory->context,
-                                    dock->context,
-                                    GIMP_CONTEXT_PROP_IMAGE);
+                                    GIMP_CONTEXT_DISPLAY_MASK |
+                                    GIMP_CONTEXT_IMAGE_MASK);
     }
 }