callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I#1564 - Contacts: Prefer original value only when filled on contact merge

Browse Source 
Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1564
This commit is contained in:
Milan Crha
2021-07-28 12:45:04 +02:00
parent 831c13cf08
commit cdfedff55b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/addressbook/gui/widgets/eab-contact-merging.c
View File

@ -558,7 +558,12 @@ merge_dialog_data_create (EContactMergingLookup *lookup,
G_CALLBACK (dropdown_changed), data);
g_object_set_data_full (G_OBJECT (dropdown), "eab-contact-merging::dropdown-data", data, g_free);
if (field == E_CONTACT_NICKNAME || field == E_CONTACT_GIVEN_NAME || field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_FULL_NAME)
/* Only prefer the original value when it's filled */
if (string1 && *string1 && (
field == E_CONTACT_NICKNAME ||
field == E_CONTACT_GIVEN_NAME ||
field == E_CONTACT_FAMILY_NAME ||
field == E_CONTACT_FULL_NAME))
gtk_combo_box_set_active (GTK_COMBO_BOX (dropdown), 1);
else
gtk_combo_box_set_active (GTK_COMBO_BOX (dropdown), 0);