From dd57574c0427b4571c1daac42b6ffa636a8c80c1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 17 Aug 2011 21:21:22 -0400 Subject: Use new CamelService:display-name property. Simplify, simplify... --- mail/em-folder-tree-model.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'mail/em-folder-tree-model.c') diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index f9ed371430..295d9d0865 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -228,8 +228,7 @@ account_changed_cb (EAccountList *accounts, em_utils_is_local_delivery_mbox_file (camel_service_get_camel_url (service))) return; - em_folder_tree_model_add_store ( - model, CAMEL_STORE (service), account->name); + em_folder_tree_model_add_store (model, CAMEL_STORE (service)); } static void @@ -1005,20 +1004,20 @@ folder_renamed_cb (CamelStore *store, void em_folder_tree_model_add_store (EMFolderTreeModel *model, - CamelStore *store, - const gchar *display_name) + CamelStore *store) { EMFolderTreeModelStoreInfo *si; GtkTreeRowReference *reference; GtkTreeStore *tree_store; GtkTreeIter root, iter; GtkTreePath *path; + CamelService *service; CamelURL *service_url; + const gchar *display_name; gchar *uri; g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model)); g_return_if_fail (CAMEL_IS_STORE (store)); - g_return_if_fail (display_name != NULL); tree_store = GTK_TREE_STORE (model); @@ -1026,7 +1025,10 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model, if (si != NULL) em_folder_tree_model_remove_store (model, store); - service_url = camel_service_get_camel_url (CAMEL_SERVICE (store)); + service = CAMEL_SERVICE (store); + service_url = camel_service_get_camel_url (service); + display_name = camel_service_get_display_name (service); + uri = camel_url_to_string (service_url, CAMEL_URL_HIDE_ALL); /* Add the store to the tree. */ -- cgit