[gnome-online-accounts/wip/rishi/remove-email] Remove email

[Debarshi Ray <debarshir src gnome org>]

commit 78c2c19f642344c564440f267a290eedb211b6f9
Author: Debarshi Ray <debarshir gnome org>
Date:   Mon Feb 11 12:43:25 2019 +0100

    Remove email

 data/dbus-interfaces.xml             |  3 +++
 src/goabackend/goabackendenums.h     |  4 ++--
 src/goabackend/goaexchangeprovider.c | 31 -------------------------------
 3 files changed, 5 insertions(+), 33 deletions(-)
---
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 69eac79a..c0344e57 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -445,6 +445,9 @@
 
       An account object implements this interface if it provides
       email-like messaging capabilities.
+
+      The #org.gnome.OnlineAccounts.Mail interface is not used
+      by any account.
   -->
   <interface name="org.gnome.OnlineAccounts.Mail">
     <!-- EmailAddress:
diff --git a/src/goabackend/goabackendenums.h b/src/goabackend/goabackendenums.h
index cba20e28..b8c14aac 100644
--- a/src/goabackend/goabackendenums.h
+++ b/src/goabackend/goabackendenums.h
@@ -34,7 +34,7 @@ G_BEGIN_DECLS
  * @GOA_PROVIDER_GROUP_CONTACTS: Providers that offer address book services.
  *   For example, CardDAV.
  * @GOA_PROVIDER_GROUP_MAIL: Providers that offer email-like messaging
- *   services. For example, IMAP and SMTP.
+ *   services. For example, IMAP and SMTP. Currently unused.
  * @GOA_PROVIDER_GROUP_TICKETING: Providers with ticketing
  *   capabilities. For example, Kerberos.
  * @GOA_PROVIDER_GROUP_CHAT: Providers that offer chat-like messaging
@@ -59,7 +59,7 @@ typedef enum
 /**
  * GoaProviderFeatures:
  * @GOA_PROVIDER_FEATURE_BRANDED: Common providers to be highlighted (ie. Google, OwnCloud).
- * @GOA_PROVIDER_FEATURE_MAIL: Mail services (ie. SMTP, IMAP).
+ * @GOA_PROVIDER_FEATURE_MAIL: Mail services (ie. SMTP, IMAP); currently unused.
  * @GOA_PROVIDER_FEATURE_CALENDAR: Calendaring services (ie. CalDAV).
  * @GOA_PROVIDER_FEATURE_CONTACTS: Addressbook services (ie. CardDAV).
  * @GOA_PROVIDER_FEATURE_CHAT: Instant messaging services (ie. XMPP, IRC).
diff --git a/src/goabackend/goaexchangeprovider.c b/src/goabackend/goaexchangeprovider.c
index 46d43149..3f09df08 100644
--- a/src/goabackend/goaexchangeprovider.c
+++ b/src/goabackend/goaexchangeprovider.c
@@ -61,7 +61,6 @@ static GoaProviderFeatures
 get_provider_features (GoaProvider *provider)
 {
   return GOA_PROVIDER_FEATURE_BRANDED |
-         GOA_PROVIDER_FEATURE_MAIL |
          GOA_PROVIDER_FEATURE_CALENDAR |
          GOA_PROVIDER_FEATURE_CONTACTS;
 }
@@ -84,11 +83,9 @@ build_object (GoaProvider         *provider,
 {
   GoaAccount *account = NULL;
   GoaExchange *exchange = NULL;
-  GoaMail *mail = NULL;
   GoaPasswordBased *password_based = NULL;
   gboolean calendar_enabled;
   gboolean contacts_enabled;
-  gboolean mail_enabled;
   gboolean ret = FALSE;
 
   /* Chain up */
@@ -117,27 +114,6 @@ build_object (GoaProvider         *provider,
 
   account = goa_object_get_account (GOA_OBJECT (object));
 
-  /* Email */
-  mail = goa_object_get_mail (GOA_OBJECT (object));
-  mail_enabled = g_key_file_get_boolean (key_file, group, "MailEnabled", NULL);
-  if (mail_enabled)
-    {
-      if (mail == NULL)
-        {
-          const gchar *email_address;
-
-          email_address = goa_account_get_presentation_identity (account);
-          mail = goa_mail_skeleton_new ();
-          g_object_set (G_OBJECT (mail), "email-address", email_address, NULL);
-          goa_object_skeleton_set_mail (object, mail);
-        }
-    }
-  else
-    {
-      if (mail != NULL)
-        goa_object_skeleton_set_mail (object, NULL);
-    }
-
   /* Calendar */
   calendar_enabled = g_key_file_get_boolean (key_file, group, "CalendarEnabled", NULL);
   goa_object_skeleton_attach_calendar (object, NULL, calendar_enabled, FALSE);
@@ -166,14 +142,9 @@ build_object (GoaProvider         *provider,
 
   if (just_added)
     {
-      goa_account_set_mail_disabled (account, !mail_enabled);
       goa_account_set_calendar_disabled (account, !calendar_enabled);
       goa_account_set_contacts_disabled (account, !contacts_enabled);
 
-      g_signal_connect (account,
-                        "notify::mail-disabled",
-                        G_CALLBACK (goa_util_account_notify_property_cb),
-                        (gpointer) "MailEnabled");
       g_signal_connect (account,
                         "notify::calendar-disabled",
                         G_CALLBACK (goa_util_account_notify_property_cb),
@@ -188,7 +159,6 @@ build_object (GoaProvider         *provider,
 
  out:
   g_clear_object (&exchange);
-  g_clear_object (&mail);
   g_clear_object (&password_based);
   return ret;
 }
@@ -614,7 +584,6 @@ add_account (GoaProvider    *provider,
   g_variant_builder_add (&credentials, "{sv}", "password", g_variant_new_string (password));
 
   g_variant_builder_init (&details, G_VARIANT_TYPE ("a{ss}"));
-  g_variant_builder_add (&details, "{ss}", "MailEnabled", "true");
   g_variant_builder_add (&details, "{ss}", "CalendarEnabled", "true");
   g_variant_builder_add (&details, "{ss}", "ContactsEnabled", "true");
   g_variant_builder_add (&details, "{ss}", "Host", server);