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

Revert "Add portal support to g_app_info_launch_uris"

Browse Source 
This reverts commit c980bd2bc416f6762c49497ddc042cea11a30bf2.
This commit is contained in:
Matthias Clasen 2016-06-21 08:19:19 -04:00
parent 4c24fab1ba
commit 453507ac6d
1 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gio/gdesktopappinfo.c
View File

@ -2870,26 +2870,6 @@ g_desktop_app_info_launch_uris_with_dbus (GDesktopAppInfo *info,
return TRUE; return TRUE;
} }
static gboolean
should_use_portal (void)
{
const char *use_portal;
char *path;
path = g_strdup_printf ("/run/user/%d/flatpak-info", getuid());
if (g_file_test (path, G_FILE_TEST_EXISTS))
use_portal = "1";
else
{
use_portal = g_getenv ("GTK_USE_PORTAL");
if (!use_portal)
use_portal = "";
}
g_free (path);
return g_str_equal (use_portal, "1");
}
static gboolean static gboolean
g_desktop_app_info_launch_uris_internal (GAppInfo *appinfo, g_desktop_app_info_launch_uris_internal (GAppInfo *appinfo,
GList *uris, GList *uris,
@ -2907,35 +2887,6 @@ 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 ())
{
GDBusMessage *message;
GVariantBuilder opt_builder;
g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT);
message = g_dbus_message_new_method_call ("org.freedesktop.portal.Desktop",
"/org/freedesktop/portal/desktop",
"org.freedesktop.portal.AppChooser",
"OpenURI");
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 */
(const char *)uris->data,
g_variant_builder_end (&opt_builder)));
g_dbus_connection_send_message (session_bus,
message,
G_DBUS_SEND_MESSAGE_FLAGS_NONE,
NULL,
NULL);
return TRUE;
}
if (session_bus && info->app_id) if (session_bus && info->app_id)
g_desktop_app_info_launch_uris_with_dbus (info, session_bus, uris, launch_context); g_desktop_app_info_launch_uris_with_dbus (info, session_bus, uris, launch_context);
else else