[evolution] Another attempt at fixing a label-related crash.

[Matthew Barnes <mbarnes src gnome org>]

commit 0b0fb7a3a5ea531c5f17aa7e2de3bb421311a8ba
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Sep 20 23:05:59 2009 -0400

    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.

 mail/e-mail-label-list-store.c |    6 ++++++
 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 c1ca4d8..a895333 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;