[gnome-online-accounts] Google: Set ImapUserName and SmtpUserName properties correctly

[David Zeuthen <davidz src gnome org>]

commit 95e53d3fbfe9da6471fdd0bc5dae72d836f66de7
Author: David Zeuthen <davidz redhat com>
Date:   Mon Jun 20 11:24:24 2011 -0400

    Google: Set ImapUserName and SmtpUserName properties correctly
    
    Pointed out by Matthew Barnes <mbarnes redhat com>.
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 src/goabackend/goagoogleprovider.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
index fb0d51c..8260968 100644
--- a/src/goabackend/goagoogleprovider.c
+++ b/src/goabackend/goagoogleprovider.c
@@ -281,16 +281,18 @@ build_object (GoaProvider         *provider,
     {
       if (mail == NULL)
         {
+          const gchar *email_address;
+          email_address = goa_account_get_identity (account);
           mail = goa_mail_skeleton_new ();
           g_object_set (G_OBJECT (mail),
-                        "email-address",   goa_account_get_identity (account),
+                        "email-address",   email_address,
                         "imap-supported",  TRUE,
                         "imap-host",       "imap.gmail.com",
-                        "imap-user-name",  "",
+                        "imap-user-name",  email_address,
                         "imap-use-tls",    TRUE,
                         "smtp-supported",  TRUE,
                         "smtp-host",       "smtp.gmail.com",
-                        "smtp-user-name",  "",
+                        "smtp-user-name",  email_address,
                         "smtp-use-tls",    TRUE,
                         NULL);
           goa_object_skeleton_set_mail (object, mail);