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

engine: Vala disallows using nullabe enum value as real GObject property

Browse source
This commit is contained in:
Cédric Bellegarde 2022-07-20 14:35:30 +02:00
parent b3c0afddab
commit a2e59b92a3
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/engine/imap/api/imap-client-service.vala
View file

@ -558,7 +558,7 @@ public class Geary.Imap.ClientService : Geary.ClientService {
var session = source as ClientSession; var session = source as ClientSession;
if (session != null && if (session != null &&
session.protocol_state == NOT_CONNECTED && session.protocol_state == NOT_CONNECTED &&
session.disconnected != null) { session.disconnected != ClientSession.DisconnectReason.NULL) {
debug( debug(
"Session disconnected: %s: %s", "Session disconnected: %s: %s",
session.to_string(), session.to_string(),

9
src/engine/imap/api/imap-session-object.vala
View file

@ -109,10 +109,11 @@ public abstract class Geary.Imap.SessionObject : BaseObject, Logging.Source {
// Disconnect reason will null when the session is being // Disconnect reason will null when the session is being
// logged out but the logout command has not yet been // logged out but the logout command has not yet been
// completed. // completed.
var reason = ( var reason =
this.session.disconnected ?? this.session.disconnected ==
ClientSession.DisconnectReason.LOCAL_CLOSE ClientSession.DisconnectReason.NULL ?
); ClientSession.DisconnectReason.LOCAL_CLOSE :
this.session.disconnected;
close(); close();
disconnected(reason); disconnected(reason);
} }

3
src/engine/imap/transport/imap-client-session.vala
View file

@ -108,6 +108,7 @@ public class Geary.Imap.ClientSession : BaseObject, Logging.Source {
} }
public enum DisconnectReason { public enum DisconnectReason {
NULL,
LOCAL_CLOSE, LOCAL_CLOSE,
LOCAL_ERROR, LOCAL_ERROR,
REMOTE_CLOSE, REMOTE_CLOSE,
@ -277,7 +278,7 @@ public class Geary.Imap.ClientSession : BaseObject, Logging.Source {
} }
/** Specifies the reason the session was disconnected, if any. */ /** Specifies the reason the session was disconnected, if any. */
public DisconnectReason? disconnected { get; private set; default = null; } public DisconnectReason disconnected { get; private set; default = NULL; }
/** /**
* Set of IMAP extensions reported as being supported by the server. * Set of IMAP extensions reported as being supported by the server.