[gimp] Move a call to gimp_display_shell_connect() around

[Michael Natterer <mitch src gnome org>]

commit 067cfe9ff011a9d5ae0fe1f10a6d631d0b6e8406
Author: Michael Natterer <mitch gimp org>
Date:   Wed Oct 7 20:11:48 2009 +0200

    Move a call to gimp_display_shell_connect() around
    
    from gimp_display_shell_reconnect() to gimp_display_set_image()
    because it makes unsetting and setting an image in
    gimp_display_set_image() more symmetric.

 app/display/gimpdisplay.c      |    3 +++
 app/display/gimpdisplayshell.c |    2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c
index e121114..c46fdfc 100644
--- a/app/display/gimpdisplay.c
+++ b/app/display/gimpdisplay.c
@@ -637,6 +637,9 @@ gimp_display_set_image (GimpDisplay *display,
       private->instance = image->instance_count++;
 
       gimp_display_connect (display, image);
+
+      if (shell)
+        gimp_display_shell_connect (shell);
     }
 
   if (old_image)
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index af930b0..e7fbb41 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -1215,8 +1215,6 @@ gimp_display_shell_reconnect (GimpDisplayShell *shell)
       shell->fill_idle_id = 0;
     }
 
-  gimp_display_shell_connect (shell);
-
   g_signal_emit (shell, display_shell_signals[RECONNECT], 0);
 
   gimp_color_managed_profile_changed (GIMP_COLOR_MANAGED (shell));