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

Merge branch 'mjog/fix-composer-undhandled-error-build-warning' into 'mainline'

Browse source 
Fix unhandled error build warning

See merge request GNOME/geary!358
This commit is contained in:
Michael Gratton 2019-11-05 00:33:04 +00:00
commit 35007aa006
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/client/application/application-controller.vala
View file

@ -2094,8 +2094,9 @@ public class Application.Controller : Geary.BaseObject {
try { try {
full = yield context.emails.fetch_email_async( full = yield context.emails.fetch_email_async(
referred.id, referred.id,
Geary.ComposedEmail.REQUIRED_REPLY_FIELDS, Geary.ComposedEmail.REQUIRED_REPLY_FIELDS |
Geary.Folder.ListFlags.NONE, ComposerWidget.REQUIRED_FIELDS,
NONE,
cancellable cancellable
); );
} catch (Error e) { } catch (Error e) {
@ -2103,7 +2104,11 @@ public class Application.Controller : Geary.BaseObject {
} }
} }
} }
yield widget.load(full, quote, cancellable); try {
yield widget.load(full, quote, cancellable);
} catch (GLib.Error err) {
report_problem(new Geary.ProblemReport(err));
}
widget.set_focus(); widget.set_focus();
} }

3
src/client/composer/composer-widget.vala
View file

@ -623,7 +623,8 @@ public class ComposerWidget : Gtk.EventBox, Geary.BaseInterface {
*/ */
public async void load(Geary.Email? referred = null, public async void load(Geary.Email? referred = null,
string? quote = null, string? quote = null,
GLib.Cancellable? cancellable) { GLib.Cancellable? cancellable)
throws GLib.Error {
if (referred != null && if (referred != null &&
!referred.fields.is_all_set(REQUIRED_FIELDS)) { !referred.fields.is_all_set(REQUIRED_FIELDS)) {
throw new Geary.EngineError.INCOMPLETE_MESSAGE( throw new Geary.EngineError.INCOMPLETE_MESSAGE(