gimp r25261 - in trunk: . app/display

[neo svn gnome org]

Author: neo
Date: Thu Mar 27 12:22:23 2008
New Revision: 25261
URL: http://svn.gnome.org/viewvc/gimp?rev=25261&view=rev

Log:
2008-03-27  Sven Neumann  <sven gimp org>

	* app/display/gimpdisplayshell-dnd.c
	(gimp_display_shell_drop_uri_list): don't flush if there's no image.
	(gimp_display_shell_dnd_flush): use gtk_window_present() instead of
	gdk_window_focus().


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

Modified: trunk/app/display/gimpdisplayshell-dnd.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-dnd.c	(original)
+++ trunk/app/display/gimpdisplayshell-dnd.c	Thu Mar 27 12:22:23 2008
@@ -161,11 +161,7 @@
 gimp_display_shell_dnd_flush (GimpDisplayShell *shell,
                               GimpImage        *image)
 {
-  if (GTK_WIDGET_DRAWABLE (shell))
-    {
-      gdk_window_focus (GTK_WIDGET (shell)->window,
-                        gtk_get_current_event_time ());
-    }
+  gtk_window_present (GTK_WINDOW (shell));
 
   gimp_image_flush (image);
 
@@ -484,7 +480,8 @@
         }
     }
 
-  gimp_display_shell_dnd_flush (shell, image);
+  if (image)
+    gimp_display_shell_dnd_flush (shell, image);
 }
 
 static void