Mastodon
/
tootle-linux-client
mirror of https://gitlab.gnome.org/World/tootle
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix open_uri()

This commit is contained in:
Bleak Grey 2021-02-02 17:07:27 +03:00
parent f485a6d505
commit 5e2e6b68b4
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.buildconfig
View File

@ -8,7 +8,6 @@ prefix=/home/user/.cache/gnome-builder/install/tootle/host
app-id=
postbuild=
prebuild=
default=true
[default.environment]
G_MESSAGES_DEBUG=tootle

14
src/Desktop.vala
View File

@ -3,10 +3,16 @@ using GLib;
public class Tootle.Desktop {
// Open a URI in the user's default application
public static bool open_uri (string uri) {
public static bool open_uri (string _uri) {
var uri = _uri;
if (!("//" in uri))
uri = "file://" + _uri;
message (@"Opening URI: $uri");
try {
GLib.AppInfo.launch_default_for_uri (uri, null);
var success = AppInfo.launch_default_for_uri (uri, null);
if (!success)
throw new Oopsie.USER (_("launch_default_for_uri() failed"));
}
catch (Error e){
try {
@ -14,8 +20,8 @@ public class Tootle.Desktop {
Process.spawn_sync (null, spawn_args, null, SpawnFlags.SEARCH_PATH, null, null, null);
}
catch (Error e){
warning (@"Can't open URI \"$uri\": $(e.message)");
app.error (_("Open this URL in your browser:\n\n%s").printf (uri), "");
warning (@"xdg-open failed too: $(e.message)");
app.error (_("Open this URL in your browser", uri);
return false;
}
}