[gnome-online-accounts/wip/mail] Add IMAP/SMTP



commit d83b11e71767815cbfacb6e5ed3918babb43b146
Author: Debarshi Ray <debarshir gnome org>
Date:   Mon Jan 28 21:45:54 2013 +0100

    Add IMAP/SMTP
    
    Fixes: https://bugzilla.gnome.org/692736

 configure.ac                         |   11 +
 src/goabackend/Makefile.am           |    3 +
 src/goabackend/goabackendtypes.h     |   14 +-
 src/goabackend/goaimapauth.c         |   84 +++
 src/goabackend/goaimapauth.h         |   88 ++++
 src/goabackend/goaimapauthlogin.c    |  371 ++++++++++++++
 src/goabackend/goaimapauthlogin.h    |   47 ++
 src/goabackend/goaimapsmtpprovider.c |  929 ++++++++++++++++++++++++++++++++++
 src/goabackend/goaimapsmtpprovider.h |   43 ++
 src/goabackend/goaprovider.c         |    6 +-
 10 files changed, 1593 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f129b7f..f55d74a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,16 @@ if test "$enable_google" != "no"; then
   AC_DEFINE(GOA_GOOGLE_ENABLED, 1, [Enable Google data provider])
 fi
 
+# IMAP/SMTP
+AC_ARG_ENABLE([imap-smtp],
+              [AS_HELP_STRING([--enable-imap-smtp],
+              [Enable IMAP/SMTP provider])],
+              [],
+              [enable_imap_smtp=no])
+if test "$enable_imap_smtp" != "no"; then
+  AC_DEFINE(GOA_IMAP_SMTP_ENABLED, 1, [Enable IMAP/SMTP data provider])
+fi
+
 # ownCloud
 AC_ARG_ENABLE([owncloud],
               [AS_HELP_STRING([--enable-owncloud],
@@ -450,6 +460,7 @@ echo "
 
 	Flickr provider:                ${enable_flickr} (OAuth 1.0, key:${with_flickr_consumer_key} secret:${with_flickr_consumer_secret})
 	Google provider:                ${enable_google} (OAuth 2.0, id:${with_google_client_id} secret:${with_google_client_secret})
+	IMAP/SMTP provider:             ${enable_imap_smtp}
 	Microsoft Exchange provider:    ${enable_exchange}
 	ownCloud provider:              ${enable_owncloud}
 	Kerberos provider:              ${enable_kerberos}
diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am
index 6595244..218400f 100644
--- a/src/goabackend/Makefile.am
+++ b/src/goabackend/Makefile.am
@@ -73,6 +73,8 @@ libgoa_backend_1_0_la_SOURCES =						\
 	goaeditablelabel.h		goaeditablelabel.c		\
 	goaewsclient.h			goaewsclient.c			\
 	goahttpclient.h			goahttpclient.c			\
+	goaimapauth.h			goaimapauth.c			\
+	goaimapauthlogin.h		goaimapauthlogin.c		\
 	goaprovider.h			goaprovider.c			\
 	goaexchangeprovider.h		goaexchangeprovider.c		\
 	goalogging.h			goalogging.c			\
@@ -80,6 +82,7 @@ libgoa_backend_1_0_la_SOURCES =						\
 	goaoauth2provider.h		goaoauth2provider.c		\
 	goagoogleprovider.h		goagoogleprovider.c		\
 	goafacebookprovider.h		goafacebookprovider.c		\
+	goaimapsmtpprovider.h		goaimapsmtpprovider.c		\
 	goaowncloudprovider.h		goaowncloudprovider.c		\
 	goayahooprovider.h		goayahooprovider.c		\
 	goatwitterprovider.h		goatwitterprovider.c		\
diff --git a/src/goabackend/goabackendtypes.h b/src/goabackend/goabackendtypes.h
index 4ec013d..f99468d 100644
--- a/src/goabackend/goabackendtypes.h
+++ b/src/goabackend/goabackendtypes.h
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * Copyright (C) 2011, 2012 Red Hat, Inc.
+ * Copyright (C) 2011, 2012, 2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -17,7 +17,8 @@
  * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
  * Boston, MA 02111-1307, USA.
  *
- * Author: David Zeuthen <davidz redhat com>
+ * Authors: David Zeuthen <davidz redhat com>
+ *          Debarshi Ray <debarshir gnome org>
  */
 
 #if !defined (__GOA_BACKEND_INSIDE_GOA_BACKEND_H__) && !defined (GOA_BACKEND_COMPILATION)
@@ -39,6 +40,12 @@ typedef struct _GoaEwsClient GoaEwsClient;
 struct _GoaHttpClient;
 typedef struct _GoaHttpClient GoaHttpClient;
 
+struct _GoaImapAuth;
+typedef struct _GoaImapAuth GoaImapAuth;
+
+struct _GoaImapAuthLogin;
+typedef struct _GoaImapAuthLogin GoaImapAuthLogin;
+
 struct _GoaProvider;
 typedef struct _GoaProvider GoaProvider;
 
@@ -60,6 +67,9 @@ typedef struct _GoaGoogleProvider GoaGoogleProvider;
 struct _GoaFacebookProvider;
 typedef struct _GoaFacebookProvider GoaFacebookProvider;
 
+struct _GoaImapSmtpProvider;
+typedef struct _GoaImapSmtpProvider GoaImapSmtpProvider;
+
 struct _GoaOwncloudProvider;
 typedef struct _GoaOwncloudProvider GoaOwncloudProvider;
 
diff --git a/src/goabackend/goaimapauth.c b/src/goabackend/goaimapauth.c
new file mode 100644
index 0000000..f8d0bf3
--- /dev/null
+++ b/src/goabackend/goaimapauth.c
@@ -0,0 +1,84 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Zeuthen <davidz redhat com>
+ */
+
+#include "config.h"
+#include <glib/gi18n-lib.h>
+#include <stdlib.h>
+
+#include "goaimapauth.h"
+
+/**
+ * SECTION:goaimapauth
+ * @title: GoaImapAuth
+ * @short_description: Helper type for authenticating IMAP connections
+ *
+ * #GoaImapAuth is an abstract type used for authenticating
+ * IMAP connections. See #GoaImapAuthOAuth for a concrete
+ * implementation.
+ */
+
+G_DEFINE_ABSTRACT_TYPE (GoaImapAuth, goa_imap_auth, G_TYPE_OBJECT);
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+goa_imap_auth_init (GoaImapAuth *client)
+{
+}
+
+static void
+goa_imap_auth_class_init (GoaImapAuthClass *klass)
+{
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+/**
+ * goa_imap_auth_run_sync:
+ * @auth: A #GoaImapAuth.
+ * @input: A valid #GDataInputStream.
+ * @output: A valid #GDataOutputStream.
+ * @cancellable: (allow-none): A #GCancellable or %NULL.
+ * @error: Return location for error or %NULL.
+ *
+ * Authenticates the IMAP connection represented by @input and
+ * @output. This method blocks the calling thread until authentication
+ * is done.
+ *
+ * Returns: %TRUE if authentication succeeded, %FALSE if @error is
+ * set.
+ */
+gboolean
+goa_imap_auth_run_sync (GoaImapAuth         *auth,
+                        GDataInputStream    *input,
+                        GDataOutputStream   *output,
+                        GCancellable        *cancellable,
+                        GError             **error)
+{
+  g_return_val_if_fail (GOA_IS_IMAP_AUTH (auth), FALSE);
+  g_return_val_if_fail (G_IS_DATA_INPUT_STREAM (input), FALSE);
+  g_return_val_if_fail (G_IS_DATA_OUTPUT_STREAM (output), FALSE);
+  g_return_val_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable), FALSE);
+  return GOA_IMAP_AUTH_GET_CLASS (auth)->run_sync (auth, input, output, cancellable, error);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
diff --git a/src/goabackend/goaimapauth.h b/src/goabackend/goaimapauth.h
new file mode 100644
index 0000000..b60e08c
--- /dev/null
+++ b/src/goabackend/goaimapauth.h
@@ -0,0 +1,88 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Zeuthen <davidz redhat com>
+ */
+
+#if !defined (__GOA_BACKEND_INSIDE_GOA_BACKEND_H__) && !defined (GOA_BACKEND_COMPILATION)
+#error "Only <goabackend/goabackend.h> can be included directly."
+#endif
+
+#ifndef __GOA_IMAP_AUTH_H__
+#define __GOA_IMAP_AUTH_H__
+
+#include <goabackend/goabackendtypes.h>
+
+G_BEGIN_DECLS
+
+#define GOA_TYPE_IMAP_AUTH         (goa_imap_auth_get_type ())
+#define GOA_IMAP_AUTH(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_IMAP_AUTH, GoaImapAuth))
+#define GOA_IMAP_AUTH_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), GOA_TYPE_IMAP_AUTH, GoaImapAuthClass))
+#define GOA_IMAP_AUTH_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOA_TYPE_IMAP_AUTH, GoaImapAuthClass))
+#define GOA_IS_IMAP_AUTH(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_IMAP_AUTH))
+#define GOA_IS_IMAP_AUTH_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GOA_TYPE_IMAP_AUTH))
+
+struct _GoaImapAuthClass;
+struct _GoaImapAuthPrivate;
+typedef struct _GoaImapAuthClass   GoaImapAuthClass;
+typedef struct _GoaImapAuthPrivate GoaImapAuthPrivate;
+
+/**
+ * GoaImapAuth:
+ *
+ * The #GoaImapAuth structure contains only private data and
+ * should only be accessed using the provided API.
+ */
+struct _GoaImapAuth
+{
+  /*< private >*/
+  GObject parent_instance;
+  GoaImapAuthPrivate *priv;
+};
+
+/**
+ * GoaImapAuthClass:
+ * @parent_class: The parent class
+ * @run_sync: Virtual function for the goa_imap_auth_run_sync() method.
+ *
+ * Class structure for #GoaImapAuth.
+ */
+struct _GoaImapAuthClass
+{
+  GObjectClass parent_class;
+  gboolean (*run_sync) (GoaImapAuth         *auth,
+                        GDataInputStream    *input,
+                        GDataOutputStream   *output,
+                        GCancellable        *cancellable,
+                        GError             **error);
+  /*< private >*/
+  /* Padding for future expansion */
+  gpointer goa_reserved[8];
+};
+
+GType     goa_imap_auth_get_type (void) G_GNUC_CONST;
+gboolean  goa_imap_auth_run_sync (GoaImapAuth         *auth,
+                                  GDataInputStream    *input,
+                                  GDataOutputStream   *output,
+                                  GCancellable        *cancellable,
+                                  GError             **error);
+
+G_END_DECLS
+
+#endif /* __GOA_IMAP_AUTH_H__ */
diff --git a/src/goabackend/goaimapauthlogin.c b/src/goabackend/goaimapauthlogin.c
new file mode 100644
index 0000000..96d5976
--- /dev/null
+++ b/src/goabackend/goaimapauthlogin.c
@@ -0,0 +1,371 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Zeuthen <davidz redhat com>
+ */
+
+#include "config.h"
+#include <glib/gi18n-lib.h>
+#include <stdlib.h>
+
+#include "goaprovider.h"
+#include "goaimapauth.h"
+#include "goaimapauthlogin.h"
+
+/**
+ * SECTION:goaimapauthlogin
+ * @title: GoaImapAuthLogin
+ * @short_description: LOGIN authentication method for IMAP
+ *
+ * #GoaImapAuthLogin implements the standard <ulink
+ * url="http://tools.ietf.org/html/rfc3501#section-6.2.3";>LOGIN</ulink>
+ * authentication method (e.g. using usernames / passwords) for IMAP.
+ */
+
+/**
+ * GoaImapAuthLogin:
+ *
+ * The #GoaImapAuthLogin structure contains only private data
+ * and should only be accessed using the provided API.
+ */
+struct _GoaImapAuthLogin
+{
+  GoaImapAuth parent_instance;
+
+  GoaProvider *provider;
+  GoaObject *object;
+  gchar *user_name;
+  gchar *password;
+};
+
+typedef struct
+{
+  GoaImapAuthClass parent_class;
+
+} GoaImapAuthLoginClass;
+
+enum
+{
+  PROP_0,
+  PROP_PROVIDER,
+  PROP_OBJECT,
+  PROP_USER_NAME,
+  PROP_PASSWORD
+};
+
+static gboolean goa_imap_auth_login_run_sync (GoaImapAuth         *_auth,
+                                              GDataInputStream    *input,
+                                              GDataOutputStream   *output,
+                                              GCancellable        *cancellable,
+                                              GError             **error);
+
+G_DEFINE_TYPE (GoaImapAuthLogin, goa_imap_auth_login, GOA_TYPE_IMAP_AUTH);
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+goa_imap_auth_login_finalize (GObject *object)
+{
+  GoaImapAuthLogin *auth = GOA_IMAP_AUTH_LOGIN (object);
+
+  g_clear_object (&auth->provider);
+  g_clear_object (&auth->object);
+  g_free (auth->user_name);
+  g_free (auth->password);
+
+  G_OBJECT_CLASS (goa_imap_auth_login_parent_class)->finalize (object);
+}
+
+static void
+goa_imap_auth_login_get_property (GObject      *object,
+                                  guint         prop_id,
+                                  GValue       *value,
+                                  GParamSpec   *pspec)
+{
+  GoaImapAuthLogin *auth = GOA_IMAP_AUTH_LOGIN (object);
+
+  switch (prop_id)
+    {
+    case PROP_PROVIDER:
+      g_value_set_object (value, auth->provider);
+      break;
+
+    case PROP_OBJECT:
+      g_value_set_object (value, auth->object);
+      break;
+
+    case PROP_USER_NAME:
+      g_value_set_string (value, auth->user_name);
+      break;
+
+    case PROP_PASSWORD:
+      g_value_set_string (value, auth->password);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+goa_imap_auth_login_set_property (GObject      *object,
+                                  guint         prop_id,
+                                  const GValue *value,
+                                  GParamSpec   *pspec)
+{
+  GoaImapAuthLogin *auth = GOA_IMAP_AUTH_LOGIN (object);
+
+  switch (prop_id)
+    {
+    case PROP_PROVIDER:
+      auth->provider = g_value_dup_object (value);
+      break;
+
+    case PROP_OBJECT:
+      auth->object = g_value_dup_object (value);
+      break;
+
+    case PROP_USER_NAME:
+      auth->user_name = g_value_dup_string (value);
+      break;
+
+    case PROP_PASSWORD:
+      auth->password = g_value_dup_string (value);
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+
+static void
+goa_imap_auth_login_init (GoaImapAuthLogin *client)
+{
+}
+
+static void
+goa_imap_auth_login_class_init (GoaImapAuthLoginClass *klass)
+{
+  GObjectClass *gobject_class;
+  GoaImapAuthClass *auth_class;
+
+  gobject_class = G_OBJECT_CLASS (klass);
+  gobject_class->finalize     = goa_imap_auth_login_finalize;
+  gobject_class->get_property = goa_imap_auth_login_get_property;
+  gobject_class->set_property = goa_imap_auth_login_set_property;
+
+  auth_class = GOA_IMAP_AUTH_CLASS (klass);
+  auth_class->run_sync = goa_imap_auth_login_run_sync;
+
+  /**
+   * GoaImapAuthLogin:provider:
+   *
+   * The #GoaProvider object for the account or %NULL.
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_PROVIDER,
+                                   g_param_spec_object ("provider",
+                                                        "provider",
+                                                        "provider",
+                                                        GOA_TYPE_PROVIDER,
+                                                        G_PARAM_READABLE |
+                                                        G_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY |
+                                                        G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GoaImapAuthLogin:object:
+   *
+   * The #GoaObject object for the account.
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_OBJECT,
+                                   g_param_spec_object ("object",
+                                                        "object",
+                                                        "object",
+                                                        GOA_TYPE_OBJECT,
+                                                        G_PARAM_READABLE |
+                                                        G_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY |
+                                                        G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GoaImapAuthLogin:user-name:
+   *
+   * The user name.
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_USER_NAME,
+                                   g_param_spec_string ("user-name",
+                                                        "user-name",
+                                                        "user-name",
+                                                        NULL,
+                                                        G_PARAM_READABLE |
+                                                        G_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY |
+                                                        G_PARAM_STATIC_STRINGS));
+
+  /**
+   * GoaImapAuthLogin:password:
+   *
+   * The password or %NULL.
+   *
+   * If this is %NULL, the credentials are looked up using
+   * goa_provider_lookup_credentials_sync() using the
+   * #GoaImapAuthLogin:provider and #GoaImapAuthLogin:object for
+   * @provider and @object. The credentials are expected to be a
+   * %G_VARIANT_VARDICT and the key <literal>imap-password</literal>
+   * is used to look up the password.
+   */
+  g_object_class_install_property (gobject_class,
+                                   PROP_PASSWORD,
+                                   g_param_spec_string ("password",
+                                                        "password",
+                                                        "password",
+                                                        NULL,
+                                                        G_PARAM_READABLE |
+                                                        G_PARAM_WRITABLE |
+                                                        G_PARAM_CONSTRUCT_ONLY |
+                                                        G_PARAM_STATIC_STRINGS));
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+/**
+ * goa_imap_auth_login_new:
+ * @provider: (allow-none): A #GoaLoginProvider or %NULL.
+ * @object: (allow-none): An account object or %NULL.
+ * @user_name: The user name to use.
+ * @password: (allow-none): The password to use or %NULL to look it up (see the #GoaImapAuthLogin:password property).
+ *
+ * Creates a new #GoaImapAuth to be used for username/password authentication.
+ *
+ * Returns: (type GoaImapAuthLogin): A #GoaImapAuthLogin. Free with g_object_unref().
+ */
+GoaImapAuth *
+goa_imap_auth_login_new (GoaProvider       *provider,
+                         GoaObject         *object,
+                         const gchar       *user_name,
+                         const gchar       *password)
+{
+  g_return_val_if_fail (provider == NULL || GOA_IS_PROVIDER (provider), NULL);
+  g_return_val_if_fail (object == NULL || GOA_IS_OBJECT (object), NULL);
+  g_return_val_if_fail (user_name != NULL, NULL);
+  return GOA_IMAP_AUTH (g_object_new (GOA_TYPE_IMAP_AUTH_LOGIN,
+                                      "provider", provider,
+                                      "object", object,
+                                      "user-name", user_name,
+                                      "password", password,
+                                      NULL));
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static gboolean
+goa_imap_auth_login_run_sync (GoaImapAuth         *_auth,
+                              GDataInputStream    *input,
+                              GDataOutputStream   *output,
+                              GCancellable        *cancellable,
+                              GError             **error)
+{
+  GoaImapAuthLogin *auth = GOA_IMAP_AUTH_LOGIN (_auth);
+  gchar *request;
+  gchar *response;
+  gboolean ret;
+  gchar *password;
+
+  request = NULL;
+  response = NULL;
+  password = NULL;
+  ret = FALSE;
+
+  /* TODO: support looking up the password from the keyring */
+  if (auth->password != NULL)
+    {
+      password = g_strdup (auth->password);
+    }
+  else if (auth->provider != NULL && auth->object != NULL)
+    {
+      GVariant *credentials;
+      credentials = goa_provider_lookup_credentials_sync (auth->provider,
+                                                          auth->object,
+                                                          cancellable,
+                                                          error);
+      if (credentials == NULL)
+        {
+          g_prefix_error (error, "Error looking up credentials for IMAP LOGIN in keyring: ");
+          goto out;
+        }
+      if (!g_variant_lookup (credentials, "imap-password", "s", &password))
+        {
+          g_set_error (error,
+                       GOA_ERROR,
+                       GOA_ERROR_FAILED,
+                       "Did not find imap-password in credentials");
+          g_variant_unref (credentials);
+          goto out;
+        }
+      g_variant_unref (credentials);
+    }
+  else
+    {
+      g_set_error (error,
+                   GOA_ERROR,
+                   GOA_ERROR_FAILED,
+                   "Cannot do IMAP LOGIN without a password");
+      goto out;
+    }
+
+  request = g_strdup_printf ("A001 LOGIN %s %s\r\n", auth->user_name, password);
+  if (!g_data_output_stream_put_string (output, request, cancellable, error))
+    goto out;
+
+ again:
+  response = g_data_input_stream_read_line (input, NULL, cancellable, error);
+  if (response == NULL)
+    goto out;
+  /* ignore untagged responses */
+  if (g_str_has_prefix (response, "*"))
+    {
+      g_free (response);
+      goto again;
+    }
+  if (!g_str_has_prefix (response, "A001 OK"))
+    {
+      g_set_error (error,
+                   GOA_ERROR,
+                   GOA_ERROR_FAILED,
+                   "Unexpected response `%s' while doing LOGIN authentication",
+                   response);
+      goto out;
+    }
+
+  ret = TRUE;
+
+ out:
+  g_free (response);
+  g_free (request);
+  g_free (password);
+  return ret;
+}
diff --git a/src/goabackend/goaimapauthlogin.h b/src/goabackend/goaimapauthlogin.h
new file mode 100644
index 0000000..5d2a1ba
--- /dev/null
+++ b/src/goabackend/goaimapauthlogin.h
@@ -0,0 +1,47 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2011 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Zeuthen <davidz redhat com>
+ */
+
+#if !defined (__GOA_BACKEND_INSIDE_GOA_BACKEND_H__) && !defined (GOA_BACKEND_COMPILATION)
+#error "Only <goabackend/goabackend.h> can be included directly."
+#endif
+
+#ifndef __GOA_IMAP_AUTH_LOGIN_H__
+#define __GOA_IMAP_AUTH_LOGIN_H__
+
+#include <goabackend/goabackendtypes.h>
+
+G_BEGIN_DECLS
+
+#define GOA_TYPE_IMAP_AUTH_LOGIN         (goa_imap_auth_login_get_type ())
+#define GOA_IMAP_AUTH_LOGIN(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_IMAP_AUTH_LOGIN, GoaImapAuthLogin))
+#define GOA_IS_IMAP_AUTH_LOGIN(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_IMAP_AUTH_LOGIN))
+
+
+GType        goa_imap_auth_login_get_type (void) G_GNUC_CONST;
+GoaImapAuth *goa_imap_auth_login_new (GoaProvider       *provider,
+                                      GoaObject         *object,
+                                      const gchar       *user_name,
+                                      const gchar       *password);
+
+G_END_DECLS
+
+#endif /* __GOA_IMAP_AUTH_LOGIN_H__ */
diff --git a/src/goabackend/goaimapsmtpprovider.c b/src/goabackend/goaimapsmtpprovider.c
new file mode 100644
index 0000000..c771486
--- /dev/null
+++ b/src/goabackend/goaimapsmtpprovider.c
@@ -0,0 +1,929 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2011, 2013 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: David Zeuthen <davidz redhat com>
+ *          Debarshi Ray <debarshir gnome org>
+ */
+
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
+#include "goaimapauthlogin.h"
+#include "goaimapclient.h"
+#include "goaimapsmtpprovider.h"
+#include "goalogging.h"
+#include "goaprovider.h"
+#include "goautils.h"
+
+/**
+ * GoaImapSmtpProvider:
+ *
+ * The #GoaImapSmtpProvider structure contains only private data and should
+ * only be accessed using the provided API.
+ */
+struct _GoaImapSmtpProvider
+{
+  /*< private >*/
+  GoaProvider parent_instance;
+};
+
+typedef struct _GoaImapSmtpProviderClass GoaImapSmtpProviderClass;
+
+struct _GoaImapSmtpProviderClass
+{
+  GoaProviderClass parent_class;
+};
+
+/**
+ * SECTION:goaimapsmtpprovider
+ * @title: GoaImapSmtpProvider
+ * @short_description: A provider for IMAP and SMTP servers
+ *
+ * #GoaImapSmtpProvider is used to access IMAP and SMTP mail servers.
+ */
+
+G_DEFINE_TYPE_WITH_CODE (GoaImapSmtpProvider, goa_imap_smtp_provider, GOA_TYPE_PROVIDER,
+                         g_io_extension_point_implement (GOA_PROVIDER_EXTENSION_POINT_NAME,
+							 g_define_type_id,
+							 "imap_smtp",
+							 0));
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static const gchar *
+get_provider_type (GoaProvider *_provider)
+{
+  return "imap_smtp";
+}
+
+static const gchar *
+get_name (GoaProvider *_provider)
+{
+  return _("IMAP/SMTP Account");
+}
+
+static GoaProviderGroup
+get_provider_group (GoaProvider *_provider)
+{
+  return GOA_PROVIDER_GROUP_MAIL;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static gboolean on_handle_get_password (GoaPasswordBased      *interface,
+                                        GDBusMethodInvocation *invocation,
+                                        const gchar           *id,
+                                        gpointer               user_data);
+
+static gboolean
+build_object (GoaProvider         *provider,
+              GoaObjectSkeleton   *object,
+              GKeyFile            *key_file,
+              const gchar         *group,
+              GDBusConnection     *connection,
+              gboolean             just_added,
+              GError             **error)
+{
+  GoaAccount *account;
+  GoaMail *mail;
+  GoaPasswordBased *password_based;
+  gboolean enabled;
+  gboolean imap_use_ssl;
+  gboolean imap_use_tls;
+  gboolean imap_ignore_bad_tls;
+  gboolean ret;
+  gboolean smtp_use_ssl;
+  gboolean smtp_use_tls;
+  gboolean smtp_ignore_bad_tls;
+  gchar *email_address;
+  gchar *imap_host;
+  gchar *imap_user_name;
+  gchar *smtp_host;
+  gchar *smtp_user_name;
+
+  account = NULL;
+  mail = NULL;
+  password_based = NULL;
+  email_address = NULL;
+  imap_host = NULL;
+  imap_user_name = NULL;
+  smtp_host = NULL;
+  smtp_user_name = NULL;
+
+  ret = FALSE;
+
+  /* Chain up */
+  if (!GOA_PROVIDER_CLASS (goa_imap_smtp_provider_parent_class)->build_object (provider,
+                                                                               object,
+                                                                               key_file,
+                                                                               group,
+                                                                               connection,
+                                                                               just_added,
+                                                                               error))
+    goto out;
+
+  password_based = goa_object_get_password_based (GOA_OBJECT (object));
+  if (password_based == NULL)
+    {
+      password_based = goa_password_based_skeleton_new ();
+      /* Ensure D-Bus method invocations run in their own thread */
+      g_dbus_interface_skeleton_set_flags (G_DBUS_INTERFACE_SKELETON (password_based),
+                                           G_DBUS_INTERFACE_SKELETON_FLAGS_HANDLE_METHOD_INVOCATIONS_IN_THREAD);
+      goa_object_skeleton_set_password_based (object, password_based);
+      g_signal_connect (password_based,
+                        "handle-get-password",
+                        G_CALLBACK (on_handle_get_password),
+                        NULL);
+    }
+
+  account = goa_object_get_account (GOA_OBJECT (object));
+
+  /* Email */
+  mail = goa_object_get_mail (GOA_OBJECT (object));
+  enabled = g_key_file_get_boolean (key_file, group, "Enabled", NULL);
+  if (enabled)
+    {
+      if (mail == NULL)
+        {
+          email_address = g_key_file_get_string (key_file, group, "EmailAddress", NULL);
+
+          imap_host = g_key_file_get_string (key_file, group, "ImapHost", NULL);
+          imap_user_name = g_key_file_get_string (key_file, group, "ImapUserName", NULL);
+          if (imap_user_name == NULL)
+            imap_user_name = g_strdup (g_get_user_name ());
+          imap_use_ssl = g_key_file_get_boolean (key_file, group, "ImapUseSsl", NULL);
+          imap_use_tls = g_key_file_get_boolean (key_file, group, "ImapUseTls", NULL);
+          imap_ignore_bad_tls = g_key_file_get_boolean (key_file, group, "ImapIgnoreBadTls", NULL);
+
+          smtp_host = g_key_file_get_string (key_file, group, "SmtpHost", NULL);
+          smtp_user_name = g_key_file_get_string (key_file, group, "SmtpUserName", NULL);
+          if (smtp_user_name == NULL)
+            smtp_user_name = g_strdup (g_get_user_name ());
+          smtp_use_ssl = g_key_file_get_boolean (key_file, group, "SmtpUseSsl", NULL);
+          smtp_use_tls = g_key_file_get_boolean (key_file, group, "SmtpUseTls", NULL);
+          smtp_ignore_bad_tls = g_key_file_get_boolean (key_file, group, "SmtpIgnoreBadTls", NULL);
+
+          mail = goa_mail_skeleton_new ();
+          g_object_set (G_OBJECT (mail),
+                        "email-address", email_address,
+                        "imap-supported", TRUE,
+                        "imap-host", imap_host,
+                        "imap-user-name", imap_user_name,
+                        "imap-use-ssl", imap_use_ssl,
+                        "imap-use-tls", imap_use_tls,
+                        "smtp-supported", TRUE,
+                        "smtp-host", smtp_host,
+                        "smtp-user-name", smtp_user_name,
+                        "smtp-use-ssl", smtp_use_ssl,
+                        "smtp-use-tls", smtp_use_tls,
+                        NULL);
+          goa_object_skeleton_set_mail (object, mail);
+        }
+    }
+  else
+    {
+      if (mail != NULL)
+        goa_object_skeleton_set_mail (object, NULL);
+    }
+
+  ret = TRUE;
+
+ out:
+  g_clear_object (&account);
+  g_clear_object (&mail);
+  g_clear_object (&password_based);
+  g_free (email_address);
+  g_free (imap_host);
+  g_free (imap_user_name);
+  g_free (smtp_host);
+  g_free (smtp_user_name);
+  return ret;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static gboolean
+ensure_credentials_sync (GoaProvider         *provider,
+                         GoaObject           *object,
+                         gint                *out_expires_in,
+                         GCancellable        *cancellable,
+                         GError             **error)
+{
+  /* TODO: we could try and log into the mail server etc. but for now we don't */
+  if (out_expires_in != NULL)
+    *out_expires_in = 0;
+  return TRUE;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+add_entry (GtkWidget     *table,
+           guint          row,
+           const gchar   *text,
+           GtkWidget    **out_entry)
+{
+  GtkWidget *label;
+  GtkWidget *entry;
+
+  label = gtk_label_new (NULL);
+  gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), text);
+  gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
+  gtk_table_attach (GTK_TABLE (table), label,
+                    0, 1,
+                    row, row + 1,
+                    GTK_FILL, GTK_FILL, 0, 0);
+  entry = gtk_entry_new ();
+  gtk_table_attach (GTK_TABLE (table), entry,
+                    1, 2,
+                    row, row + 1,
+                    GTK_FILL, GTK_FILL, 0, 0);
+  gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
+  if (out_entry != NULL)
+    *out_entry = entry;
+}
+
+static void
+add_check_button (GtkWidget     *table,
+                  guint          row,
+                  const gchar   *text,
+                  GtkWidget    **out_check_button)
+{
+  GtkWidget *button;
+  button = gtk_check_button_new_with_mnemonic (text);
+  gtk_table_attach (GTK_TABLE (table), button,
+                    1, 2,
+                    row, row + 1,
+                    GTK_FILL, GTK_FILL, 0, 0);
+  if (out_check_button != NULL)
+    *out_check_button = button;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+typedef struct
+{
+  GtkDialog *dialog;
+  GMainLoop *loop;
+
+  GtkWidget *cluebar;
+  GtkWidget *cluebar_label;
+
+  GtkWidget *intro_address_entry;
+  GtkWidget *intro_name_entry;
+
+  GtkWidget *imap_server_entry;
+  GtkWidget *imap_user_entry;
+  GtkWidget *imap_password_entry;
+  GtkWidget *imap_show_password;
+  GtkWidget *imap_use_tls;
+  GtkWidget *imap_ignore_bad_tls;
+
+  GtkWidget *smtp_server_entry;
+  GtkWidget *smtp_user_entry;
+  GtkWidget *smtp_password_entry;
+  GtkWidget *smtp_show_password;
+  GtkWidget *smtp_use_tls;
+  GtkWidget *smtp_ignore_bad_tls;
+
+  gchar *account_object_path;
+
+  GError *error;
+} AddAccountData;
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+
+static void
+update_intro (AddAccountData *data)
+{
+  const gchar *address;
+  const gchar *name;
+  gboolean address_valid;
+  gboolean name_valid;
+
+  address_valid = FALSE;
+  name_valid = FALSE;
+
+  address = gtk_entry_get_text (GTK_ENTRY (data->intro_address_entry));
+  if (address != NULL)
+    {
+      const gchar *s;
+      /* TODO: could do more validation */
+      s = strstr (address, "@");
+      if (s != NULL && strstr (s + 1, ".") != NULL)
+        address_valid = TRUE;
+    }
+
+  name = gtk_entry_get_text (GTK_ENTRY (data->intro_name_entry));
+  if (name != NULL && strlen (name) > 0)
+    {
+      name_valid = TRUE;
+    }
+
+  gtk_dialog_set_response_sensitive (data->dialog, GTK_RESPONSE_OK, address_valid && name_valid);
+}
+
+static void
+on_intro_entry_changed (GtkEditable *editable,
+                        gpointer     user_data)
+{
+  AddAccountData *data = user_data;
+  update_intro (data);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+on_imap_show_password_toggled (GtkToggleButton   *button,
+                               gpointer           user_data)
+{
+  AddAccountData *data = user_data;
+  gtk_entry_set_visibility (GTK_ENTRY (data->imap_password_entry),
+                            gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->imap_show_password)));
+}
+
+static void
+on_imap_tls_toggled (GtkToggleButton   *button,
+                     gpointer           user_data)
+{
+  AddAccountData *data = user_data;
+  gtk_widget_set_sensitive (data->imap_ignore_bad_tls,
+                            gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->imap_use_tls)));
+}
+
+static void
+update_imap (AddAccountData *data)
+{
+  gboolean can_go_forward;
+
+  can_go_forward = FALSE;
+  if (gtk_entry_get_text_length (GTK_ENTRY (data->imap_server_entry)) > 0 &&
+      gtk_entry_get_text_length (GTK_ENTRY (data->imap_user_entry)) > 0 &&
+      gtk_entry_get_text_length (GTK_ENTRY (data->imap_password_entry)) > 0)
+    {
+      can_go_forward = TRUE;
+    }
+  gtk_dialog_set_response_sensitive (data->dialog, GTK_RESPONSE_OK, can_go_forward);
+}
+
+static void
+on_imap_entry_changed (GtkEditable *editable,
+                       gpointer     user_data)
+{
+  AddAccountData *data = user_data;
+  update_imap (data);
+}
+
+static gboolean
+check_imap_settings (AddAccountData  *data,
+                     GError         **error)
+{
+  GoaImapClient *client;
+  GoaImapAuth *auth;
+  gboolean ret;
+  GError *local_error;
+
+  ret = FALSE;
+
+  auth = goa_imap_auth_login_new (NULL,
+                                  NULL,
+                                  gtk_entry_get_text (GTK_ENTRY (data->imap_user_entry)),
+                                  gtk_entry_get_text (GTK_ENTRY (data->imap_password_entry)));
+
+  /* TODO: run in thread and show spinner while connecting */
+  client = goa_imap_client_new ();
+  if (!goa_imap_client_connect_sync (client,
+                                     gtk_entry_get_text (GTK_ENTRY (data->imap_server_entry)),
+                                     gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->imap_use_tls)),
+                                     gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->imap_ignore_bad_tls)),
+                                     auth,
+                                     NULL, /* cancellable */
+                                     error))
+    goto out;
+
+  ret = TRUE;
+
+ out:
+  local_error = NULL;
+  if (!goa_imap_client_disconnect_sync (client,
+                                        NULL, /* GCancellable */
+                                        &local_error))
+    {
+      goa_warning ("Error closing connection: %s (%s, %d)",
+                   local_error->message, g_quark_to_string (local_error->domain), local_error->code);
+      g_error_free (local_error);
+    }
+  g_object_unref (client);
+  g_object_unref (auth);
+  return ret;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+on_smtp_show_password_toggled (GtkToggleButton   *button,
+                               gpointer           user_data)
+{
+  AddAccountData *data = user_data;
+  gtk_entry_set_visibility (GTK_ENTRY (data->smtp_password_entry),
+                            gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->smtp_show_password)));
+}
+
+static void
+on_smtp_tls_toggled (GtkToggleButton   *button,
+                     gpointer           user_data)
+{
+  AddAccountData *data = user_data;
+  gtk_widget_set_sensitive (data->smtp_ignore_bad_tls,
+                            gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->smtp_use_tls)));
+}
+
+static void
+update_smtp (AddAccountData *data)
+{
+  gboolean can_go_forward;
+
+  can_go_forward = FALSE;
+  if (gtk_entry_get_text_length (GTK_ENTRY (data->smtp_server_entry)) > 0 &&
+      gtk_entry_get_text_length (GTK_ENTRY (data->smtp_user_entry)) > 0 &&
+      gtk_entry_get_text_length (GTK_ENTRY (data->smtp_password_entry)) > 0)
+    {
+      can_go_forward = TRUE;
+    }
+  gtk_dialog_set_response_sensitive (data->dialog, GTK_RESPONSE_OK, can_go_forward);
+}
+
+static void
+on_smtp_entry_changed (GtkEditable *editable,
+                       gpointer     user_data)
+{
+  AddAccountData *data = user_data;
+  update_smtp (data);
+}
+
+static gboolean
+check_smtp_settings (AddAccountData  *data,
+                     GError         **error)
+{
+  /* TODO */
+  g_warning ("TODO check_smtp_settings()");
+  return TRUE;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+intro_auto_set_other_pages (AddAccountData *data)
+{
+  const gchar *address;
+  const gchar *s;
+  gchar *user_name;
+  gchar *imap_server;
+  gchar *smtp_server;
+
+  /* These are just guesses - the use will be able to override himself */
+
+  address = gtk_entry_get_text (GTK_ENTRY (data->intro_address_entry));
+  s = strstr (address, "@");
+  g_assert (s != NULL);
+  user_name = g_strndup (address, s - address);
+  imap_server = g_strdup_printf ("imap.%s", s + 1);
+  smtp_server = g_strdup_printf ("smtp.%s", s + 1);
+
+  gtk_entry_set_text (GTK_ENTRY (data->imap_user_entry), user_name);
+  gtk_entry_set_text (GTK_ENTRY (data->imap_server_entry), imap_server);
+  gtk_entry_set_text (GTK_ENTRY (data->smtp_server_entry), smtp_server);
+
+  g_free (user_name);
+  g_free (imap_server);
+  g_free (smtp_server);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+add_account_cb (GoaManager *manager, GAsyncResult *res, gpointer user_data)
+{
+  AddAccountData *data = user_data;
+  goa_manager_call_add_account_finish (manager,
+                                       &data->account_object_path,
+                                       res,
+                                       &data->error);
+  g_main_loop_quit (data->loop);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static GoaObject *
+add_account (GoaProvider    *_provider,
+             GoaClient      *client,
+             GtkDialog      *dialog,
+             GtkBox         *vbox,
+             GError        **error)
+{
+  GoaImapSmtpProvider *provider = GOA_IMAP_SMTP_PROVIDER (_provider);
+  AddAccountData data;
+  GoaObject *ret;
+  GtkWidget *table;
+  GtkWidget *notebook;
+  guint row;
+  gint response;
+  GError *local_error;
+  gchar *s;
+  GVariantBuilder builder;
+
+  ret = NULL;
+
+  memset (&data, 0, sizeof (AddAccountData));
+  data.loop = g_main_loop_new (NULL, FALSE);
+  data.dialog = dialog;
+  data.error = NULL;
+
+  goa_utils_set_dialog_title (_provider, dialog, TRUE);
+
+  data.cluebar = gtk_info_bar_new ();
+  gtk_info_bar_set_message_type (GTK_INFO_BAR (data.cluebar), GTK_MESSAGE_ERROR);
+  gtk_widget_set_no_show_all (data.cluebar, TRUE);
+  data.cluebar_label = gtk_label_new ("");
+  gtk_label_set_line_wrap (GTK_LABEL (data.cluebar_label), TRUE);
+  gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (data.cluebar))),
+                     data.cluebar_label);
+  gtk_box_pack_start (GTK_BOX (vbox), data.cluebar, FALSE, TRUE, 0);
+
+  notebook = gtk_notebook_new ();
+  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
+  gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
+  gtk_widget_set_margin_left (notebook, 12);
+  gtk_box_pack_start (GTK_BOX (vbox), notebook, FALSE, TRUE, 0);
+
+  gtk_widget_show_all (GTK_WIDGET (vbox));
+  gtk_dialog_add_button (dialog, "_Forward", GTK_RESPONSE_OK);
+  gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
+  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_OK, FALSE);
+
+  /* ------------------------------------------------------------ */
+  /* Set up the Intro page */
+
+  row = 0;
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_notebook_insert_page (GTK_NOTEBOOK (notebook), table, NULL, -1);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 12);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  add_entry (table, row++, _("Email _Address"), &data.intro_address_entry);
+  add_entry (table, row++, _("_Name"), &data.intro_name_entry);
+  g_signal_connect (data.intro_address_entry,
+                    "changed",
+                    G_CALLBACK (on_intro_entry_changed),
+                    &data);
+  g_signal_connect (data.intro_name_entry,
+                    "changed",
+                    G_CALLBACK (on_intro_entry_changed),
+                    &data);
+  gtk_widget_show_all (table);
+
+  /* ------------------------------------------------------------ */
+  /* Show the Intro page */
+
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 0);
+  gtk_widget_show_all (GTK_WIDGET (vbox));
+  gtk_widget_grab_focus (data.intro_address_entry);
+
+  response = gtk_dialog_run (GTK_DIALOG (dialog));
+  if (response != GTK_RESPONSE_OK)
+    {
+      g_set_error (error,
+                   GOA_ERROR,
+                   GOA_ERROR_DIALOG_DISMISSED,
+                   "dismissed");
+      goto out;
+    }
+
+  /* ------------------------------------------------------------ */
+  /* Then set up the IMAP page */
+
+  row = 0;
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_notebook_insert_page (GTK_NOTEBOOK (notebook), table, NULL, -1);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 12);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  add_entry (table, row++, _("IMAP _Server"), &data.imap_server_entry);
+  add_entry (table, row++, _("_User Name"), &data.imap_user_entry);
+  add_entry (table, row++, _("_Password"), &data.imap_password_entry);
+  add_check_button (table, row++, _("Sho_w Password"), &data.imap_show_password);
+  add_check_button (table, row++, _("Use s_ecure connection"), &data.imap_use_tls);
+  add_check_button (table, row++, _("_Don't check certificates"), &data.imap_ignore_bad_tls);
+  gtk_entry_set_text (GTK_ENTRY (data.imap_user_entry), g_get_user_name ());
+  gtk_entry_set_visibility (GTK_ENTRY (data.imap_password_entry), FALSE);
+  g_signal_connect (data.imap_show_password,
+                    "toggled",
+                    G_CALLBACK (on_imap_show_password_toggled),
+                    &data);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data.imap_use_tls), TRUE);
+  g_signal_connect (data.imap_use_tls,
+                    "toggled",
+                    G_CALLBACK (on_imap_tls_toggled),
+                    &data);
+  g_signal_connect (data.imap_server_entry,
+                    "changed",
+                    G_CALLBACK (on_imap_entry_changed),
+                    &data);
+  g_signal_connect (data.imap_user_entry,
+                    "changed",
+                    G_CALLBACK (on_imap_entry_changed),
+                    &data);
+  g_signal_connect (data.imap_password_entry,
+                    "changed",
+                    G_CALLBACK (on_imap_entry_changed),
+                    &data);
+  gtk_widget_show_all (table);
+
+  /* ------------------------------------------------------------ */
+  /* Then set up the SMTP page */
+
+  row = 0;
+  table = gtk_table_new (2, 2, FALSE);
+  gtk_notebook_insert_page (GTK_NOTEBOOK (notebook), table, NULL, -1);
+  gtk_table_set_row_spacings (GTK_TABLE (table), 12);
+  gtk_table_set_col_spacings (GTK_TABLE (table), 12);
+  add_entry (table, row++, _("SMTP _Server"), &data.smtp_server_entry);
+  add_entry (table, row++, _("_User Name"), &data.smtp_user_entry);
+  add_entry (table, row++, _("_Password"), &data.smtp_password_entry);
+  add_check_button (table, row++, _("Sho_w Password"), &data.smtp_show_password);
+  add_check_button (table, row++, _("Use s_ecure connection"), &data.smtp_use_tls);
+  add_check_button (table, row++, _("_Don't check certificates"), &data.smtp_ignore_bad_tls);
+  gtk_entry_set_text (GTK_ENTRY (data.smtp_user_entry), g_get_user_name ());
+  gtk_entry_set_visibility (GTK_ENTRY (data.smtp_password_entry), FALSE);
+  g_signal_connect (data.smtp_show_password,
+                    "toggled",
+                    G_CALLBACK (on_smtp_show_password_toggled),
+                    &data);
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data.smtp_use_tls), TRUE);
+  g_signal_connect (data.smtp_use_tls,
+                    "toggled",
+                    G_CALLBACK (on_smtp_tls_toggled),
+                    &data);
+  g_signal_connect (data.smtp_server_entry,
+                    "changed",
+                    G_CALLBACK (on_smtp_entry_changed),
+                    &data);
+  g_signal_connect (data.smtp_user_entry,
+                    "changed",
+                    G_CALLBACK (on_smtp_entry_changed),
+                    &data);
+  g_signal_connect (data.smtp_password_entry,
+                    "changed",
+                    G_CALLBACK (on_smtp_entry_changed),
+                    &data);
+  gtk_widget_show_all (table);
+
+  /* ------------------------------------------------------------ */
+  /* Then prefill other pages from the obtained info */
+  intro_auto_set_other_pages (&data);
+
+  /* ------------------------------------------------------------ */
+  /* Then show the IMAP page */
+
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 1);
+  gtk_widget_grab_focus (data.imap_server_entry);
+
+ imap_again:
+  response = gtk_dialog_run (GTK_DIALOG (dialog));
+  if (response != GTK_RESPONSE_OK)
+    {
+      g_set_error (error,
+                   GOA_ERROR,
+                   GOA_ERROR_DIALOG_DISMISSED,
+                   "dismissed");
+      goto out;
+    }
+
+  /* Check that IMAP settings work */
+  local_error = NULL;
+  if (!check_imap_settings (&data, &local_error))
+    {
+      gchar *markup;
+      markup = g_strdup_printf ("<b>%s:</b> %s",
+                                _("Error connecting to IMAP server"),
+                                local_error->message);
+      gtk_label_set_markup (GTK_LABEL (data.cluebar_label), markup);
+      gtk_widget_set_no_show_all (data.cluebar, FALSE);
+      gtk_widget_show_all (data.cluebar);
+      g_free (markup);
+      g_error_free (local_error);
+      goto imap_again;
+    }
+
+  /* hide cluebar errors */
+  gtk_widget_hide (data.cluebar);
+
+  /* ------------------------------------------------------------ */
+  /* Then show the SMTP page */
+
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), 2);
+  gtk_widget_grab_focus (data.smtp_server_entry);
+
+  /* Re-use the password from the IMAP page */
+  gtk_entry_set_text (GTK_ENTRY (data.smtp_password_entry),
+                      gtk_entry_get_text (GTK_ENTRY (data.imap_password_entry)));
+
+ smtp_again:
+  response = gtk_dialog_run (GTK_DIALOG (dialog));
+  if (response != GTK_RESPONSE_OK)
+    {
+      g_set_error (error,
+                   GOA_ERROR,
+                   GOA_ERROR_DIALOG_DISMISSED,
+                   "dismissed");
+      goto out;
+    }
+
+  /* Check that SMTP settings work */
+  local_error = NULL;
+  if (!check_smtp_settings (&data, &local_error))
+    {
+      gchar *markup;
+      markup = g_strdup_printf ("<b>%s:</b> %s",
+                                _("Error connecting to SMTP server"),
+                                local_error->message);
+      gtk_label_set_markup (GTK_LABEL (data.cluebar_label), markup);
+      gtk_widget_set_no_show_all (data.cluebar, FALSE);
+      gtk_widget_show_all (data.cluebar);
+      g_free (markup);
+      g_error_free (local_error);
+      goto smtp_again;
+    }
+
+  /* OK, everything is dandy, add the account */
+  /* we want the GoaClient to update before this method returns (so it
+   * can create a proxy for the new object) so run the mainloop while
+   * waiting for this to complete
+   */
+  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{ss}"));
+  g_variant_builder_add (&builder, "{ss}", "Enabled", "true");
+  g_variant_builder_add (&builder, "{ss}", "EmailAddress",
+                         gtk_entry_get_text (GTK_ENTRY (data.intro_address_entry)));
+  g_variant_builder_add (&builder, "{ss}", "ImapHost",
+                         gtk_entry_get_text (GTK_ENTRY (data.imap_server_entry)));
+  g_variant_builder_add (&builder, "{ss}", "ImapUserName",
+                         gtk_entry_get_text (GTK_ENTRY (data.imap_user_entry)));
+  g_variant_builder_add (&builder, "{ss}", "ImapUseTls",
+                         gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data.imap_use_tls))  ? "true" : "false");
+  g_variant_builder_add (&builder, "{ss}", "ImapIgnoreBadTls",
+                         gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data.imap_ignore_bad_tls)) ? "true" : "false");
+  g_variant_builder_add (&builder, "{ss}", "SmtpHost",
+                         gtk_entry_get_text (GTK_ENTRY (data.smtp_server_entry)));
+  g_variant_builder_add (&builder, "{ss}", "SmtpUserName",
+                         gtk_entry_get_text (GTK_ENTRY (data.smtp_user_entry)));
+  g_variant_builder_add (&builder, "{ss}", "SmtpUseTls",
+                         gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data.smtp_use_tls))  ? "true" : "false");
+  g_variant_builder_add (&builder, "{ss}", "SmtpIgnoreBadTls",
+                         gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data.smtp_ignore_bad_tls)) ? "true" : "false");
+  goa_manager_call_add_account (goa_client_get_manager (client),
+                                goa_provider_get_provider_type (GOA_PROVIDER (provider)),
+                                gtk_entry_get_text (GTK_ENTRY (data.intro_name_entry)),
+                                g_variant_builder_end (&builder),
+                                NULL, /* GCancellable* */
+                                (GAsyncReadyCallback) add_account_cb,
+                                &data);
+  g_main_loop_run (data.loop);
+  if (data.error != NULL)
+    {
+      g_propagate_error (error, data.error);
+      goto out;
+    }
+
+  ret = GOA_OBJECT (g_dbus_object_manager_get_object (goa_client_get_object_manager (client),
+                                                      data.account_object_path));
+  /* TODO: run in worker thread */
+  g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT);
+  g_variant_builder_add (&builder, "{sv}", "imap-password",
+                         g_variant_new_string (gtk_entry_get_text (GTK_ENTRY (data.imap_password_entry))));
+  g_variant_builder_add (&builder, "{sv}", "smtp-password",
+                         g_variant_new_string (gtk_entry_get_text (GTK_ENTRY (data.smtp_password_entry))));
+  if (!goa_provider_store_credentials_sync (GOA_PROVIDER (provider),
+                                            ret,
+                                            g_variant_builder_end (&builder),
+                                            NULL, /* GCancellable */
+                                            error))
+    goto out;
+
+ out:
+  g_free (data.account_object_path);
+  if (data.loop != NULL)
+    g_main_loop_unref (data.loop);
+  return ret;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+show_account (GoaProvider         *provider,
+              GoaClient           *client,
+              GoaObject           *object,
+              GtkBox              *vbox,
+              GtkGrid             *left,
+              GtkGrid             *right)
+{
+  /* Chain up */
+  GOA_PROVIDER_CLASS (goa_imap_smtp_provider_parent_class)->show_account (provider,
+                                                                          client,
+                                                                          object,
+                                                                          vbox,
+                                                                          left,
+                                                                          right);
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static void
+goa_imap_smtp_provider_init (GoaImapSmtpProvider *provider)
+{
+}
+
+static void
+goa_imap_smtp_provider_class_init (GoaImapSmtpProviderClass *klass)
+{
+  GoaProviderClass *provider_class;
+
+  provider_class = GOA_PROVIDER_CLASS (klass);
+  provider_class->get_provider_type          = get_provider_type;
+  provider_class->get_name                   = get_name;
+  provider_class->get_provider_group         = get_provider_group;
+  provider_class->add_account                = add_account;
+  provider_class->build_object               = build_object;
+  provider_class->show_account               = show_account;
+  provider_class->ensure_credentials_sync    = ensure_credentials_sync;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
+static gboolean
+on_handle_get_password (GoaPasswordBased      *interface,
+                        GDBusMethodInvocation *invocation,
+                        const gchar           *id,
+                        gpointer               user_data)
+{
+  GoaObject *object;
+  GoaAccount *account;
+  GoaProvider *provider;
+  GError *error;
+  GVariant *credentials;
+  gchar *password;
+
+  /* TODO: maybe log what app is requesting access */
+
+  password = NULL;
+  credentials = NULL;
+
+  object = GOA_OBJECT (g_dbus_interface_get_object (G_DBUS_INTERFACE (interface)));
+  account = goa_object_peek_account (object);
+  provider = goa_provider_get_for_provider_type (goa_account_get_provider_type (account));
+
+  error = NULL;
+  credentials = goa_utils_lookup_credentials_sync (provider,
+                                                   object,
+                                                   NULL, /* GCancellable* */
+                                                   &error);
+  if (credentials == NULL)
+    {
+      g_dbus_method_invocation_take_error (invocation, error);
+      goto out;
+    }
+
+  if (!g_variant_lookup (credentials, id, "s", &password))
+    {
+      g_dbus_method_invocation_return_error (invocation,
+                                             GOA_ERROR,
+                                             GOA_ERROR_FAILED, /* TODO: more specific */
+                                             "Did not find password with id `%s' in credentials",
+                                             id);
+      goto out;
+    }
+
+  goa_password_based_complete_get_password (interface, invocation, password);
+
+ out:
+  g_free (password);
+  if (credentials != NULL)
+    g_variant_unref (credentials);
+  g_object_unref (provider);
+  return TRUE; /* invocation was handled */
+}
+
diff --git a/src/goabackend/goaimapsmtpprovider.h b/src/goabackend/goaimapsmtpprovider.h
new file mode 100644
index 0000000..e18f6fb
--- /dev/null
+++ b/src/goabackend/goaimapsmtpprovider.h
@@ -0,0 +1,43 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Copyright (C) 2011, 2013 Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General
+ * Public License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: David Zeuthen <davidz redhat com>
+ *          Debarshi Ray <debarshir gnome org>
+ */
+
+#if !defined (__GOA_BACKEND_INSIDE_GOA_BACKEND_H__) && !defined (GOA_BACKEND_COMPILATION)
+#error "Only <goabackend/goabackend.h> can be included directly."
+#endif
+
+#ifndef __GOA_IMAP_SMTP_PROVIDER_H__
+#define __GOA_IMAP_SMTP_PROVIDER_H__
+
+#include <goabackend/goabackendtypes.h>
+
+G_BEGIN_DECLS
+
+#define GOA_TYPE_IMAP_SMTP_PROVIDER   (goa_imap_smtp_provider_get_type ())
+#define GOA_IMAP_SMTP_PROVIDER(o)     (G_TYPE_CHECK_INSTANCE_CAST ((o), GOA_TYPE_IMAP_SMTP_PROVIDER, GoaImapSmtpProvider))
+#define GOA_IS_IMAP_SMTP_PROVIDER(o)  (G_TYPE_CHECK_INSTANCE_TYPE ((o), GOA_TYPE_IMAP_SMTP_PROVIDER))
+
+GType goa_imap_smtp_provider_get_type (void) G_GNUC_CONST;
+
+G_END_DECLS
+
+#endif /* __GOA_IMAP_SMTP_PROVIDER_H__ */
diff --git a/src/goabackend/goaprovider.c b/src/goabackend/goaprovider.c
index 0b36dfa..808000f 100644
--- a/src/goabackend/goaprovider.c
+++ b/src/goabackend/goaprovider.c
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * Copyright (C) 2011, 2012 Red Hat, Inc.
+ * Copyright (C) 2011, 2012, 2013 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -30,6 +30,7 @@
 #include "goaexchangeprovider.h"
 #include "goagoogleprovider.h"
 #include "goafacebookprovider.h"
+#include "goaimapsmtpprovider.h"
 #include "goaowncloudprovider.h"
 #include "goayahooprovider.h"
 #include "goatwitterprovider.h"
@@ -663,6 +664,9 @@ ensure_ep_and_builtins (void)
 #ifdef GOA_EXCHANGE_ENABLED
       type = GOA_TYPE_EXCHANGE_PROVIDER;
 #endif
+#ifdef GOA_IMAP_SMTP_ENABLED
+      type = GOA_TYPE_IMAP_SMTP_PROVIDER;
+#endif
 #ifdef GOA_KERBEROS_ENABLED
       type = GOA_TYPE_KERBEROS_PROVIDER;
 #endif



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]