[evolution-patches] Patch for 70540

[Hans Petter Jansson <hpj ximian com>]

This patch should go into the 2.0 branch in addition to HEAD.

-- 
Hans Petter Jansson | <hpj novell com>
Evolution Developer | http://hp.cl.no/

? 70540.patch
? util/deleted
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1896
diff -u -p -r1.1896 ChangeLog
--- ChangeLog	21 Jan 2005 00:15:06 -0000	1.1896
+++ ChangeLog	21 Jan 2005 04:07:26 -0000
@@ -1,3 +1,11 @@
+2005-01-21  Hans Petter Jansson  <hpj novell com>
+
+	* gui/contact-editor/e-contact-quick-add.c (quick_add_set_name)
+	(quick_add_set_email): Don't set properties on the contact immediately.
+	(clicked_cb): Set the properties on the contact immediately before
+	passing it on. This way, the FULL_NAME will only be set once, and so
+	the FILE_AS field will be updated here.
+
 2005-01-21 Sivaiah Nallagatla <snallagatla novell com>
 
 	* gui/component/addressbook-config.c 
Index: gui/contact-editor/e-contact-quick-add.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/contact-editor/e-contact-quick-add.c,v
retrieving revision 1.36
diff -u -p -r1.36 e-contact-quick-add.c
--- gui/contact-editor/e-contact-quick-add.c	26 Feb 2004 21:01:34 -0000	1.36
+++ gui/contact-editor/e-contact-quick-add.c	21 Jan 2005 04:07:26 -0000
@@ -98,8 +98,6 @@ quick_add_set_name (QuickAdd *qa, const 
 
 	g_free (qa->name);
 	qa->name = g_strdup (name);
-
-	e_contact_set (qa->contact, E_CONTACT_FULL_NAME, (char *) name);
 }
 
 static void
@@ -110,8 +108,6 @@ quick_add_set_email (QuickAdd *qa, const
 
 	g_free (qa->email);
 	qa->email = g_strdup (email);
-
-	e_contact_set (qa->contact, E_CONTACT_EMAIL_1, (char*)email);
 }
 
 static void
@@ -242,9 +238,9 @@ clicked_cb (GtkWidget *w, gint button, g
 			email = tmp;
 		}
 
-		quick_add_set_name (qa, name);
-		quick_add_set_email (qa, email);
-	
+		e_contact_set (qa->contact, E_CONTACT_FULL_NAME, (char *) name ? name : "");
+		e_contact_set (qa->contact, E_CONTACT_EMAIL_1,   (char *) email ? email : "");
+
 		g_free (name);
 		g_free (email);
 	}