nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'wip/522-mailto-broken' into 'mainline'

Browse source 
Add HANDLES_OPEN flag to GearyApplication

Closes #522

See merge request GNOME/geary!297
This commit is contained in:
Michael Gratton 2019-09-06 01:05:40 +00:00
commit 2d64dbf663
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/client/application/geary-application.vala
View file

@ -366,7 +366,10 @@ public class GearyApplication : Gtk.Application {
public GearyApplication() {
Object(
application_id: APP_ID,
flags: GLib.ApplicationFlags.HANDLES_COMMAND_LINE
flags: (
GLib.ApplicationFlags.HANDLES_OPEN |
GLib.ApplicationFlags.HANDLES_COMMAND_LINE
)
);
this.add_main_option_entries(OPTION_ENTRIES);
_instance = this;
@ -463,6 +466,23 @@ public class GearyApplication : Gtk.Application {
this.present.begin();
}
public override void open(GLib.File[] targets, string hint) {
foreach (GLib.File target in targets) {
if (target.get_uri_scheme() == "mailto") {
string mailto = target.get_uri();
// Due to GNOME/glib#1886, the email address may be
// prefixed by a '///'. If so, remove it.
if (mailto.has_prefix("mailto:///")) {
mailto = (
Geary.ComposedEmail.MAILTO_SCHEME +
mailto.substring("mailto:///".length)
);
}
this.new_composer.begin(mailto);
}
}
}
public void add_window_accelerators(string action,
string[] accelerators,
Variant? param = null) {