nautilus-sendto r327 - in trunk: . src/plugins

[hadess svn gnome org]

Author: hadess
Date: Thu May 29 13:07:00 2008
New Revision: 327
URL: http://svn.gnome.org/viewvc/nautilus-sendto?rev=327&view=rev

Log:
2008-05-29  Bastien Nocera  <hadess hadess net>

	* src/plugins/evolution.c (contacts_selected_cb): When a contact is
	selected, try getting the name from different fields, and don't use
	E_CONTACT_NAME_OR_ORG, as it could add a comma in the name, causing
	problems when sending e-mails. Should fix:
	https://bugzilla.redhat.com/show_bug.cgi?id=448880



Modified:
   trunk/ChangeLog
   trunk/src/plugins/evolution.c

Modified: trunk/src/plugins/evolution.c
==============================================================================
--- trunk/src/plugins/evolution.c	(original)
+++ trunk/src/plugins/evolution.c	Thu May 29 13:07:00 2008
@@ -75,9 +75,15 @@
 	char *text;
 
 	email = e_contact_get (contact, E_CONTACT_EMAIL_1);
-	name = e_contact_get (contact, E_CONTACT_NAME_OR_ORG);
 
-	text = g_strdup_printf (CONTACT_FORMAT, (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), email);
+	name = e_contact_get (contact, E_CONTACT_FULL_NAME);
+	if (name == NULL) {
+		name = e_contact_get (contact, E_CONTACT_NICKNAME);
+		if (name == NULL)
+			name = e_contact_get (contact, E_CONTACT_ORG);
+	}
+
+	text = g_strdup_printf (CONTACT_FORMAT, (char*) name, email);
 	gtk_entry_set_text (GTK_ENTRY (entry), text);
 	g_free (text);
 }