gimp r25148 - in trunk: . app/gui

[mitch svn gnome org]

Author: mitch
Date: Thu Mar 20 21:07:09 2008
New Revision: 25148
URL: http://svn.gnome.org/viewvc/gimp?rev=25148&view=rev

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

	* app/gui/gui-vtable.c (gui_display_create): add back code that
	made sure the newly created display/image combo is the user
	context's active one.



Modified:
   trunk/ChangeLog
   trunk/app/gui/gui-vtable.c

Modified: trunk/app/gui/gui-vtable.c
==============================================================================
--- trunk/app/gui/gui-vtable.c	(original)
+++ trunk/app/gui/gui-vtable.c	Thu Mar 20 21:07:09 2008
@@ -303,7 +303,15 @@
                                   image_managers->data);
    }
 
-  gimp_context_set_display (context, display);
+  if (gimp_context_get_display (context) == display)
+    {
+      gimp_context_set_image (context, image);
+      gimp_context_display_changed (context);
+    }
+  else
+    {
+      gimp_context_set_display (context, display);
+    }
 
   gimp_ui_manager_update (GIMP_DISPLAY_SHELL (display->shell)->menubar_manager,
                           display);