[gtk+/gtk-3-22] Make GTK_DEBUG=interactive work better

[Matthias Clasen <matthiasc src gnome org>]

commit 074f391f108b412e00059dfb98553f437069bd50
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jan 4 14:42:33 2017 -0500

    Make GTK_DEBUG=interactive work better
    
    We currently have various ways to initialize GTK+, and not
    all of them were supporting this way of bringing up the
    inspector. Fix this.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=776807

 gtk/gtkmain.c |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 0760008..3152971 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -809,6 +809,9 @@ post_parse_hook (GOptionContext *context,
 
           return FALSE;
         }
+
+      if (gtk_get_debug_flags () & GTK_DEBUG_INTERACTIVE)
+        gtk_window_set_interactive_debugging (TRUE);
     }
 
   return TRUE;
@@ -988,7 +991,15 @@ gtk_init_with_args (gint                 *argc,
     return FALSE;
 
 done:
-  return GDK_PRIVATE_CALL (gdk_display_open_default) () != NULL;
+  if (GDK_PRIVATE_CALL (gdk_display_open_default) () != NULL)
+    {
+      if (gtk_get_debug_flags () & GTK_DEBUG_INTERACTIVE)
+        gtk_window_set_interactive_debugging (TRUE);
+
+      return TRUE;
+    }
+
+  return FALSE;
 }