[gimp/gtk3-port] SQUASH INTO 79f59f71fcb33b9eb3e922979f3c4411661a1387

[Michael Natterer <mitch src gnome org>]

commit 814cc4dfe322539ad8f95b2bb3e94bd8bf1eac4e
Author: Michael Natterer <mitch gimp org>
Date:   Wed May 9 12:35:25 2018 +0200

    SQUASH INTO 79f59f71fcb33b9eb3e922979f3c4411661a1387

 app/widgets/gimpdialogfactory.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/app/widgets/gimpdialogfactory.c b/app/widgets/gimpdialogfactory.c
index 50c2308..4919bc0 100644
--- a/app/widgets/gimpdialogfactory.c
+++ b/app/widgets/gimpdialogfactory.c
@@ -629,22 +629,22 @@ gimp_dialog_factory_dialog_new_internal (GimpDialogFactory *factory,
   if (! dialog)
     return NULL;
 
-  if (parent)
-    {
-      GtkWidget *toplevel = gtk_widget_get_toplevel (parent);
-
-      if (GTK_IS_WINDOW (toplevel))
-        {
-          gtk_window_set_transient_for (GTK_WINDOW (dialog),
-                                        GTK_WINDOW (toplevel));
-        }
-    }
-
   if (gtk_widget_is_toplevel (dialog))
     {
       gtk_window_set_screen (GTK_WINDOW (dialog),
                              gdk_display_get_default_screen (gdk_monitor_get_display (monitor)));
 
+      if (parent)
+        {
+          GtkWidget *parent_toplevel = gtk_widget_get_toplevel (parent);
+
+          if (GTK_IS_WINDOW (parent_toplevel))
+            {
+              gtk_window_set_transient_for (GTK_WINDOW (dialog),
+                                            GTK_WINDOW (parent_toplevel));
+            }
+        }
+
       toplevel = dialog;
     }
   else if (GIMP_IS_DOCK (dialog))