From 28e56d0dde37679db6372408fa6e71e3f8c7f190 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 16 Mar 2023 16:06:49 -0400 Subject: [PATCH] label: Use GtkFileLauncher for file URI The GtkUriLauncher calls into the openuri portal, which distinguishes between files, directories, and URI. The GtkFileLauncher contains logic to deal with this, because it can already handle the file and folder differences. If we have a file:// URI it's easier to create a GFile out of it, and use the GtkFileLauncher API, while leaving the GtkUriLauncher API for every other URI scheme. Same fix as de3c1d0c73987225869908, for GtkLabel. Fixes: #5671 --- gtk/gtklabel.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 19a8b8f027..49908566dc 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -29,10 +29,10 @@ #include "gtkbuildable.h" #include "gtkeventcontrollermotion.h" #include "gtkeventcontrollerfocus.h" +#include "gtkfilelauncher.h" #include "gtkgesturedrag.h" #include "gtkgestureclick.h" #include "gtkgesturesingle.h" -#include #include "gtkmarshalers.h" #include "gtknotebook.h" #include "gtkpangoprivate.h" @@ -59,6 +59,7 @@ #include #include #include +#include /** * GtkLabel: @@ -2102,14 +2103,31 @@ gtk_label_activate_link (GtkLabel *self, { GtkWidget *widget = GTK_WIDGET (self); GtkWidget *toplevel = GTK_WIDGET (gtk_widget_get_root (widget)); - GtkUriLauncher *launcher; + const char *uri_scheme; if (!GTK_IS_WINDOW (toplevel)) return FALSE; - launcher = gtk_uri_launcher_new (uri); - gtk_uri_launcher_launch (launcher, GTK_WINDOW (toplevel), NULL, NULL, NULL); - g_object_unref (launcher); + uri_scheme = g_uri_peek_scheme (uri); + if (g_strcmp0 (uri_scheme, "file") == 0) + { + GFile *file; + GtkFileLauncher *launcher; + + file = g_file_new_for_uri (uri); + launcher = gtk_file_launcher_new (file); + gtk_file_launcher_launch (launcher, GTK_WINDOW (toplevel), NULL, NULL, NULL); + g_object_unref (launcher); + g_object_unref (file); + } + else + { + GtkUriLauncher *launcher; + + launcher = gtk_uri_launcher_new (uri); + gtk_uri_launcher_launch (launcher, GTK_WINDOW (toplevel), NULL, NULL, NULL); + g_object_unref (launcher); + } return TRUE; } -- 2.30.2