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

Merge branch 'mjog/misc-fixes' into 'mainline'

Browse source 
Misc fixes

See merge request GNOME/geary!526
This commit is contained in:
Michael Gratton 2020-06-27 06:35:54 +00:00
commit c4a3ab64a9
5 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -427,13 +427,18 @@ internal class Application.Controller : Geary.BaseObject {
save_to
);
register_composer(composer);
show_composer(composer);
try {
yield composer.load_context(type, context, quote);
} catch (GLib.Error err) {
report_problem(new Geary.ProblemReport(err));
}
// Have to load the body before showing the composer
// because we need to know what other messages the context
// message refers to, so it can be displayed as an inline
// composer if appropriate.
show_composer(composer);
}
return composer;
}

2
src/client/application/application-main-window.vala
View file

@ -542,6 +542,7 @@ public class Application.MainWindow :
);
// Translators: An info bar button label
var auth_retry = new Gtk.Button.with_label(_("Login"));
auth_retry.show();
// Translators: An info bar button tool-tip
auth_retry.tooltip_text = _(
"Retry login, you will be prompted for your password"
@ -557,6 +558,7 @@ public class Application.MainWindow :
);
// Translators: An info bar button label
var cert_retry = new Gtk.Button.with_label(_("Check"));
cert_retry.show();
// Translators: An info bar button tool-tip
cert_retry.tooltip_text = _(
"Check the security details for the connection"

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

@ -24,7 +24,11 @@ private extern Type components_reflow_box_get_type();
public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
/** The email fields the composer requires for referred email. */
/**
* The email fields the composer requires for context email.
*
* @see load_context
*/
public const Geary.Email.Field REQUIRED_FIELDS = ENVELOPE | HEADER | BODY;
/// Translators: Title for an empty composer window
@ -667,6 +671,7 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
base_unref();
}
/** Loads an empty message into the composer. */
public async void load_empty_body(Geary.RFC822.MailboxAddress? to = null)
throws GLib.Error {
if (to != null) {
@ -675,6 +680,7 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
yield finish_loading("", "", false);
}
/** Loads a mailto: URL into the composer. */
public async void load_mailto(string mailto)
throws GLib.Error {
Gee.HashMultiMap<string, string> headers = new Gee.HashMultiMap<string, string>();
@ -734,7 +740,11 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
}
/**
* Loads the message into the composer editor.
* Loads a draft, reply, or forwarded message into the composer.
*
* If the given context email does not contain the fields
* specified by {@link REQUIRED_FIELDS}, it will be loaded from
* the current account context's store with those.
*/
public async void load_context(ContextType type,
Geary.Email context,

2
src/engine/imap-engine/imap-engine-email-prefetcher.vala
View file

@ -25,7 +25,7 @@ private class Geary.ImapEngine.EmailPrefetcher : Geary.BaseObject {
);
private const Geary.Email.Field PREFETCH_FIELDS = Geary.Email.Field.ALL;
private const int PREFETCH_CHUNK_BYTES = 32 * 1024;
private const int PREFETCH_CHUNK_BYTES = 512 * 1024;
public Nonblocking.CountingSemaphore active_sem { get; private set;
default = new Nonblocking.CountingSemaphore(null); }

6
src/engine/imap/transport/imap-deserializer.vala
View file

@ -463,7 +463,11 @@ public class Geary.Imap.Deserializer : BaseObject, Logging.Source {
}
private void save_literal_parameter() {
save_parameter(new LiteralParameter(block_buffer));
var literal = new LiteralParameter(block_buffer);
if (!Logging.is_suppressed_domain(this.logging_domain)) {
debug(literal.coerce_to_string_parameter().to_string());
}
save_parameter(literal);
block_buffer = null;
}