luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-24 03:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Take the parent window id from the environment"

Browse Source 
This reverts commit 4b44094309efe9a86bc0f3e6e687059ee55a90ab.
This commit is contained in:
Matthias Clasen 2016-06-21 08:19:09 -04:00
parent b78cf7cb23
commit 4c24fab1ba
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/gdesktopappinfo.c
View File

@ -2907,19 +2907,12 @@ g_desktop_app_info_launch_uris_internal (GAppInfo *appinfo,
session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); 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 ()) if (session_bus && uris && should_use_portal ())
{ {
GDBusMessage *message; GDBusMessage *message;
GVariantBuilder opt_builder; 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); g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT);
@ -2931,7 +2924,7 @@ g_desktop_app_info_launch_uris_internal (GAppInfo *appinfo,
g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT); g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT);
g_dbus_message_set_body (message, g_variant_new ("(ss@a{sv})", g_dbus_message_set_body (message, g_variant_new ("(ss@a{sv})",
parent_window ? parent_window : "", "", /*TODO find parent window */
(const char *)uris->data, (const char *)uris->data,
g_variant_builder_end (&opt_builder))); g_variant_builder_end (&opt_builder)));