[geary/geary-0.13] Merge branch 'wip/broken-enum-values' into 'master'

[Michael Gratton <mjog src gnome org>]

commit 91130395d3ba2a817ae5bb204a4dffe7e02f09f6
Author: Michael Gratton <mike vee net>
Date:   Fri Mar 1 02:30:15 2019 +0000

    Merge branch 'wip/broken-enum-values' into 'master'
    
    Fix broken enum value references
    
    See merge request GNOME/geary!153
    
    (cherry picked from commit b6c8416b2fe3293dce9c4f35634356b3d2e6f01a)
    
    85b50b4c Fix broken enum value references

 src/client/accounts/accounts-manager.vala     | 4 ++--
 src/engine/api/geary-service-information.vala | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/src/client/accounts/accounts-manager.vala b/src/client/accounts/accounts-manager.vala
index 9cc46078..b8bbc982 100644
--- a/src/client/accounts/accounts-manager.vala
+++ b/src/client/accounts/accounts-manager.vala
@@ -1396,7 +1396,7 @@ public class Accounts.ServiceConfigV1 : ServiceConfig, GLib.Object {
         string? login = service_config.get_string(LOGIN, null);
         if (login != null) {
             service.credentials = new Geary.Credentials(
-                Credentials.PASSWORD, login
+                Geary.Credentials.Method.PASSWORD, login
             );
         }
         service.remember_password = service_config.get_bool(
@@ -1500,7 +1500,7 @@ public class Accounts.ServiceConfigLegacy : ServiceConfig, GLib.Object {
         );
         if (login != null) {
             service.credentials = new Geary.Credentials(
-                Credentials.PASSWORD, login
+                Geary.Credentials.Method.PASSWORD, login
             );
         }
         service.remember_password = service_config.get_bool(
diff --git a/src/engine/api/geary-service-information.vala b/src/engine/api/geary-service-information.vala
index 2028e040..6df8fb49 100644
--- a/src/engine/api/geary-service-information.vala
+++ b/src/engine/api/geary-service-information.vala
@@ -135,7 +135,7 @@ public class Geary.ServiceInformation : GLib.Object {
      */
     public ServiceInformation.copy(ServiceInformation other) {
         // Use OTHER here to get blank defaults
-        this(other.protocol, ServiceInformation.OTHER);
+        this(other.protocol, ServiceProvider.OTHER);
         this.host = other.host;
         this.port = other.port;
         this.transport_security = other.transport_security;