[evolution] em_folder_tree_model_get_folder_name: Don't return NULL.

[Matthew Barnes <mbarnes src gnome org>]

commit 8cb1d72ab92609dd656c76a8b6267c6b4762a17f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Sep 4 09:55:11 2012 -0400

    em_folder_tree_model_get_folder_name: Don't return NULL.
    
    If a folder's display name is not available in the folder tree model for
    some reason, return the raw folder path rather than NULL.  This silences
    a runtime warning in the mail-notification plugin.
    
    This feels like a Band-Aid for a deeper issue -- perhaps we're racing
    the folder tree model?  Might be better to just fetch the CamelFolder
    asynchronously and get the folder's display name directly.

 mail/em-folder-tree-model.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 9e6616d..7eca514 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -1288,11 +1288,11 @@ em_folder_tree_model_get_folder_name (EMFolderTreeModel *model,
 
 	si = em_folder_tree_model_lookup_store_info (model, store);
 	if (si == NULL)
-		return NULL;
+		return g_strdup (full);
 
 	reference = g_hash_table_lookup (si->full_hash, full);
 	if (!gtk_tree_row_reference_valid (reference))
-		return NULL;
+		return g_strdup (full);
 
 	path = gtk_tree_row_reference_get_path (reference);
 	gtk_tree_model_get_iter (GTK_TREE_MODEL (model), &iter, path);