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

Closes #5377 Save as for unopenable attachments

Browse source
This commit is contained in:
Eric Gregory 2013-09-27 18:29:23 -07:00
parent 9e53f52978
commit 3efdc5b6eb
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/client/geary-controller.vala
View file

@ -1484,7 +1484,13 @@ public class GearyController : Geary.BaseObject {
GearyApplication.instance.config.ask_open_attachment = !ask_to_open.is_checked;
}
open_uri(attachment.file.get_uri());
// Open the attachment if we know what to do with it.
if (!open_uri(attachment.file.get_uri())) {
// Failing that, trigger a save dialog.
Gee.List<Geary.Attachment> attachment_list = new Gee.ArrayList<Geary.Attachment>();
attachment_list.add(attachment);
on_save_attachments(attachment_list);
}
}
private bool do_overwrite_confirmation(File to_overwrite) {
@ -1610,18 +1616,21 @@ public class GearyController : Geary.BaseObject {
}
// Opens a link in an external browser.
private void open_uri(string _link) {
private bool open_uri(string _link) {
string link = _link;
// Support web URLs that ommit the protocol.
if (!link.contains(":"))
link = "http://" + link;
bool ret = false;
try {
Gtk.show_uri(main_window.get_screen(), link, Gdk.CURRENT_TIME);
ret = Gtk.show_uri(main_window.get_screen(), link, Gdk.CURRENT_TIME);
} catch (Error err) {
debug("Unable to open URL. %s", err.message);
}
return ret;
}
private bool close_composition_windows() {