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

Make account-related implementation debugging ids a bit more consistent.

Browse source
This commit is contained in:
Michael James Gratton 2017-11-09 17:32:33 +11:00
parent 80680f280e
commit 403a99f768
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/engine/api/geary-folder.vala
View file

@ -552,12 +552,11 @@ public abstract class Geary.Folder : BaseObject {
*/
public abstract async Geary.Email fetch_email_async(Geary.EmailIdentifier email_id,
Geary.Email.Field required_fields, ListFlags flags, Cancellable? cancellable = null) throws Error;
/**
* Used for debugging. Should not be used for user-visible labels.
*/
public virtual string to_string() {
return "%s:%s".printf(account.to_string(), path.to_string());
return "%s:%s".printf(this.account.information.id, this.path.to_string());
}
}

7
src/engine/imap-db/imap-db-account.vala
View file

@ -233,11 +233,10 @@ private class Geary.ImapDB.Account : BaseObject {
public Account(Geary.AccountInformation account_information) {
this.account_information = account_information;
contact_store = new ImapEngine.ContactStore(this);
name = "IMAP database account for %s".printf(account_information.imap_credentials.user);
this.contact_store = new ImapEngine.ContactStore(this);
this.name = account_information.id + ":db";
}
private void check_open() throws Error {
if (db == null)
throw new EngineError.OPEN_REQUIRED("Database not open");

2
src/engine/imap/api/imap-account.vala
View file

@ -55,9 +55,9 @@ private class Geary.Imap.Account : BaseObject {
public signal void login_failed(Geary.Credentials? cred, StatusResponse? response);
public Account(Geary.AccountInformation account_information) {
name = "IMAP Account for %s".printf(account_information.imap_credentials.to_string());
this.account_information = account_information;
this.session_mgr = new ClientSessionManager(account_information);
this.name = account.id + ":imap";
this.session_mgr.ready.connect(on_session_ready);
this.session_mgr.login_failed.connect(on_login_failed);
}