Merge gnome-2-30 into express2 to get bugfixes

Note that express2 got some documentation for EExtensible and friends,
and that documentation is not in gnome-2-30 yet.  We need to cherry-pick
those commits into gnome-2-30 and elsewhere.

1 files changed, 2 insertions, 0 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 36bd4ed948..d10ceeac6f 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -605,6 +605,8 @@ e_contact_quick_add_email (const gchar *email, EContactQuickAddCallback cb, gpoi
 	if (lt != NULL && gt != NULL && (gt - lt) > 0) {
 		name = g_strndup (email, lt - email);
 		addr = g_strndup (lt + 1, gt - lt - 1);
+	} else {
+		addr = email;
 	}
 
 	e_contact_quick_add (name, addr, cb, closure);