[glib/portal: 2/17] Take the parent window id from the environment

[Matthias Clasen <matthiasc src gnome org>]

commit 5b5b1aab7b91f2918b701028a8740790566ab4ed
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jun 18 12:42:52 2016 -0400

    Take the parent window id from the environment
    
    GTK+ will set this for when showing URIs in a sandbox.

 gio/gdesktopappinfo.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
index 9a2c784..cd6abc2 100644
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -2907,12 +2907,19 @@ g_desktop_app_info_launch_uris_internal (GAppInfo                   *appinfo,
 
   session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
 
-  g_print ("show uris %s, have bus: %d, want portal %d\n",
-           uris ? (char *)uris->data : "", session_bus != NULL, should_use_portal ());
   if (session_bus && uris && should_use_portal ())
     {
       GDBusMessage *message;
       GVariantBuilder opt_builder;
+      const char *parent_window = NULL;
+
+      if (launch_context)
+        {
+          char **env;
+          env = g_app_launch_context_get_environment (launch_context);
+          parent_window = g_environ_getenv (env, "PARENT_WINDOW_ID");
+          g_strfreev (env);
+        }
 
       g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT);
 
@@ -2924,7 +2931,7 @@ g_desktop_app_info_launch_uris_internal (GAppInfo                   *appinfo,
       g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT);
 
       g_dbus_message_set_body (message, g_variant_new ("(ss a{sv})",
-                                                       "", /*TODO find parent window */
+                                                       parent_window ? parent_window : "",
                                                        (const char *)uris->data,
                                                        g_variant_builder_end (&opt_builder)));