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

Bug 765857 - Allow blank "Full Name" for email account ][

Browse Source 
Accounts without filled Full Name were missing in the list of accounts
for the From address and for an Organizer in respective dialogs.
This commit is contained in:
Milan Crha
2016-05-09 10:36:49 +02:00
parent ca1d3b8918
commit 2b440597ed
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
calendar/gui/itip-utils.c
View File

@ -147,10 +147,13 @@ itip_get_user_identities (ESourceRegistry *registry)
name = e_source_mail_identity_get_name (extension);
address = e_source_mail_identity_get_address (extension);
if (name == NULL || address == NULL)
if (!address)
continue;
identities[ii++] = g_strdup_printf ("%s <%s>", name, address);
if (name && *name)
identities[ii++] = g_strdup_printf ("%s <%s>", name, address);
else
identities[ii++] = g_strdup_printf ("%s", address);
}
g_list_free_full (list, (GDestroyNotify) g_object_unref);
@ -198,8 +201,12 @@ itip_get_fallback_identity (ESourceRegistry *registry)
name = e_source_mail_identity_get_name (mail_identity);
address = e_source_mail_identity_get_address (mail_identity);
if (name != NULL && address != NULL)
identity = g_strdup_printf ("%s <%s>", name, address);
if (address != NULL) {
if (name && *name)
identity = g_strdup_printf ("%s <%s>", name, address);
else
identity = g_strdup_printf ("%s", address);
}
g_object_unref (source);

7
e-util/e-mail-identity-combo-box.c
View File

@ -437,7 +437,7 @@ e_mail_identity_combo_box_refresh (EMailIdentityComboBox *combo_box)
name = e_source_mail_identity_get_name (extension);
address = e_source_mail_identity_get_address (extension);
if (name == NULL || address == NULL)
if (address == NULL)
continue;
queue = g_hash_table_lookup (address_table, address);
@ -446,7 +446,10 @@ e_mail_identity_combo_box_refresh (EMailIdentityComboBox *combo_box)
uid = e_source_get_uid (source);
string = g_string_sized_new (512);
g_string_append_printf (string, "%s <%s>", name, address);
if (name && *name)
g_string_append_printf (string, "%s <%s>", name, address);
else
g_string_append_printf (string, "%s", address);
/* Show the account name for duplicate email addresses. */
if (queue != NULL && g_queue_get_length (queue) > 1)