Another attempt at fixing a label-related crash.

The reporter's label list in GConf had the default labels, but without
the mnemonic underscores.  So they weren't recognized as default labels.
As a last ditch effort, generate a tag from the label name to ensure
that e_mail_label_list_store_get_tag() never returns NULL.

1 files changed, 6 insertions, 0 deletions

diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index c1ca4d82af..a8953333a4 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -427,6 +427,12 @@ e_mail_label_list_store_get_tag (EMailLabelListStore *store,
 		}
 	}
 
+	/* XXX Still no luck?  The label list in GConf must be screwed up.
+	 *     We must not return NULL because the tag is used as a key in
+	 *     the index hash table, so generate a tag from the name. */
+	if (result == NULL)
+		result = mail_label_list_store_tag_from_name (strv[0]);
+
 	g_strfreev (strv);
 
 	return result;