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

Application.Controller, Composer.Widget: Clean up composer construction

Browse source 
Clean up and simplify how composers are constructed. Ensure all
composers are constructed via Application.Composer. Provide a set of
APIs for constructing different kinds of composers with minimal
parameters, rather than having one method with eleventy different
parameters.

Mirror API changes in Composer.Widget by splitting `load` method up
into a method for each different composer type. Clean up internals a
bit as a result. Rename `ComposeType` enum and its values to
`ContextType` to better reflect what it does.
This commit is contained in:
Michael Gratton 2020-04-19 15:51:03 +10:00 • committed by Michael James Gratton
parent a98f953237
commit aac59ec53b
10 changed files with 417 additions and 482 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/client/application/application-client.vala
View file

@ -513,7 +513,7 @@ public class Application.Client : Gtk.Application {
mailto.substring(B0RKED_GLIB_MAILTO_PREFIX.length)
);
}
this.new_composer.begin(mailto);
this.new_composer_mailto.begin(mailto);
}
}
}
@ -725,10 +725,14 @@ public class Application.Client : Gtk.Application {
prefs.show();
}
public async void new_composer(string? mailto) {
public async void new_composer(Geary.RFC822.MailboxAddress? to = null) {
yield this.present();
yield this.controller.compose_new_email(to);
}
this.controller.compose(mailto);
public async void new_composer_mailto(string? mailto) {
yield this.present();
yield this.controller.compose_mailto(mailto);
}
public async void new_window(Geary.Folder? select_folder,
@ -824,7 +828,7 @@ public class Application.Client : Gtk.Application {
yield create_controller();
if (uri.down().has_prefix(MAILTO_URI_SCHEME_PREFIX)) {
yield this.new_composer(uri);
yield this.new_composer_mailto(uri);
} else {
string uri_ = uri;
// Support web URLs that omit the protocol.
@ -1146,7 +1150,7 @@ public class Application.Client : Gtk.Application {
}
private void on_activate_compose() {
this.new_composer.begin(null);
this.new_composer.begin();
}
private void on_activate_inspect() {
@ -1155,7 +1159,7 @@ public class Application.Client : Gtk.Application {
private void on_activate_mailto(SimpleAction action, Variant? param) {
if (param != null) {
this.new_composer.begin(param.get_string());
this.new_composer_mailto.begin(param.get_string());
}
}