[gimp/gimp-2-10] Issue #4119: GIMP main window not restored from Taskbar under MS Windows

[Jehan <jehanp src gnome org>]

commit e729d0b6bb22973a1e51602adb23b42ed25e1c29
Author: Jehan <jehan girinstud io>
Date:   Sun Oct 20 19:41:44 2019 +0200

    Issue #4119: GIMP main window not restored from Taskbar under MS Windows
    
    Tested in a VM. Minimized window is properly deiconified and showed to
    the front. Though a window in the back (not minimized) is not moved to
    the front.
    
    (cherry picked from commit 2f0175190795a7086e29c2055bb0c6c283a295ef)

 app/gui/gui-unique.c | 7 +++++++
 1 file changed, 7 insertions(+)
---
diff --git a/app/gui/gui-unique.c b/app/gui/gui-unique.c
index a49b7c7514..8b9000428f 100644
--- a/app/gui/gui-unique.c
+++ b/app/gui/gui-unique.c
@@ -36,6 +36,7 @@
 
 #include "display/gimpdisplay.h"
 #include "display/gimpdisplayshell.h"
+#include "display/gimpimagewindow.h"
 
 #include "file/file-open.h"
 
@@ -166,6 +167,7 @@ gui_unique_win32_message_handler (HWND   hWnd,
       if (unique_gimp)
         {
           COPYDATASTRUCT *copydata = (COPYDATASTRUCT *) lParam;
+          GimpObject     *display;
 
           if (copydata->cbData > 0)
             {
@@ -193,6 +195,11 @@ gui_unique_win32_message_handler (HWND   hWnd,
               g_source_attach (source, NULL);
               g_source_unref (source);
             }
+
+          /* Deiconify the window if minimized. */
+          display = gimp_container_get_first_child (unique_gimp->displays);
+          if (display)
+            gimp_display_shell_present (gimp_display_get_shell (GIMP_DISPLAY (display)));
         }
       return TRUE;