Merge lp:~rodrigo-moya/ubuntuone-client/fix-614055 into lp:ubuntuone-client

[Rodrigo Moya]

When the contact has no name, use whatever is available

When the contact has no name, use whatever is available

[Manuel de la Peña (mandel)]

Is there a way to easily test this?

[Rodrigo Moya (rodrigo-moya)]

> Is there a way to easily test this?

yes, add a contact without a name, but a company name, for instance. And check the company name shows in the contacts picker (./nautilus/test-contacts-picker)

[Roman Yepishev (rye)]

Hm, does not seem to be working:
   http://ubuntuone.com/p/F4L/

Here's the vcard imported to test this:

BEGIN:VCARD
VERSION:3.0
REV:2010-09-06T10:03:12Z
EMAIL;X-EVOLUTION-UI-SLOT=1;TYPE=WORK:<email address hidden>
FBURL:
CALURI:
NOTE:
NICKNAME:
ROLE:
ORG:Organization;;
TITLE:
URL:
END:VCARD

review: Needs Fixing

[Roman Yepishev (rye)]

Btw, here's what evolution shows for that vcard in the preview panel: http://ubuntuone.com/p/F4M/

[Rodrigo Moya (rodrigo-moya)]

> Hm, does not seem to be working:
> http://ubuntuone.com/p/F4L/
>
> Here's the vcard imported to test this:
>
> BEGIN:VCARD
> VERSION:3.0
> REV:2010-09-06T10:03:12Z
> EMAIL;X-EVOLUTION-UI-SLOT=1;TYPE=WORK:<email address hidden>
> FBURL:
> CALURI:
> NOTE:
> NICKNAME:
> ROLE:
> ORG:Organization;;
> TITLE:
> URL:
> END:VCARD

weird, evolution does add a FN (full name) entry to the VCARD when it has no name, so if this was created in Evolution, not sure why it's not added

[Roman Yepishev (rye)]

> weird, evolution does add a FN (full name) entry to the VCARD when it has no
> name, so if this was created in Evolution, not sure why it's not added

This was not created in evolution but it was crafted separately to list only organization. Evolution handles that fine, though, displaying the organization as the entry title.

[Rodrigo Moya (rodrigo-moya)]

> > weird, evolution does add a FN (full name) entry to the VCARD when it has no
> > name, so if this was created in Evolution, not sure why it's not added
>
> This was not created in evolution but it was crafted separately to list only
> organization. Evolution handles that fine, though, displaying the organization
> as the entry title.

Not sure what the problem is then. If Evolution can display it, this code should display it, since it uses E_CONTACT_NAME_OR_ORG, which does return either the name of the contact, the organization or the first email, whatever is available. So, unless contact_name is not NULL (can you check it under gdb please?) not sure why it is not working

[John Lenton (chipaca)]

I'm not sure this is perfect, but I'm certain it is better :)

review: Approve

[Natalia Bidart (nataliabidart)]

I can not add a contact with no name (no evolution on my side), but the code looks correct.

review: Approve

=== modified file 'nautilus/contacts-view.c'
--- nautilus/contacts-view.c	2010-07-20 15:10:34 +0000
+++ nautilus/contacts-view.c	2010-09-02 10:26:38 +0000
@@ -320,6 +320,8 @@
 		contact_name = (EContactName *) e_contact_get (contact, E_CONTACT_NAME);
 		if (contact_name != NULL)
 			full_name = e_contact_name_to_string (contact_name);
+		else
+			full_name = e_contact_get (contact, E_CONTACT_NAME_OR_ORG);
 
 		emails_list = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
 		for (al = emails_list; al != NULL; al = al->next) {