diff -u nautilus-sendto-0.13.2/debian/changelog nautilus-sendto-0.13.2/debian/changelog --- nautilus-sendto-0.13.2/debian/changelog +++ nautilus-sendto-0.13.2/debian/changelog @@ -1,3 +1,10 @@ +nautilus-sendto (0.13.2-0ubuntu2) hardy-proposed; urgency=low + + * debian/patches/90_from_svn_use_correct_email.patch: + - change from svn to use the correct email addresses (lp: #210917) + + -- Sebastien Bacher Thu, 31 Jul 2008 17:09:10 +0200 + nautilus-sendto (0.13.2-0ubuntu1) hardy; urgency=low * New upstream release (LP: #190085) only in patch2: unchanged: --- nautilus-sendto-0.13.2.orig/debian/patches/90_from_svn_use_correct_email.patch +++ nautilus-sendto-0.13.2/debian/patches/90_from_svn_use_correct_email.patch @@ -0,0 +1,21 @@ +--- trunk/src/plugins/evolution.c 2008/05/28 18:08:07 326 ++++ trunk/src/plugins/evolution.c 2008/05/29 13:07:00 327 +@@ -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); + } +