gimp r26095 - in trunk: . app/display

[neo svn gnome org]

Author: neo
Date: Wed Jul  9 10:59:19 2008
New Revision: 26095
URL: http://svn.gnome.org/viewvc/gimp?rev=26095&view=rev

Log:
2008-07-09  Sven Neumann  <sven gimp org>

	* app/display/gimpdisplayshell-close.c (gimp_display_shell_close):
	if a save dialog is active for this image, then don't allow to
	close it. Fixes bug #511965.


Modified:
   trunk/ChangeLog
   trunk/app/display/gimpdisplayshell-close.c

Modified: trunk/app/display/gimpdisplayshell-close.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-close.c	(original)
+++ trunk/app/display/gimpdisplayshell-close.c	Wed Jul  9 10:59:19 2008
@@ -90,7 +90,19 @@
       image->dirty           &&
       shell->display->config->confirm_on_close)
     {
-      gimp_display_shell_close_dialog (shell, image);
+      /*  If there's a save dialog active for this image, then raise it.
+       *  (see bug #511965)
+       */
+      GtkWidget *dialog = g_object_get_data (G_OBJECT (image),
+                                             "gimp-file-save-dialog");
+      if (dialog)
+        {
+          gtk_window_present (GTK_WINDOW (dialog));
+        }
+      else
+        {
+          gimp_display_shell_close_dialog (shell, image);
+        }
     }
   else if (image)
     {