e-util: Port to thread-safe ECategories API

This ports the following two function calls throughout Evolution:
 • e_categories_get_list() to e_categories_dup_list()
 • e_categories_get_icon_file_for() to e_categories_dup_icon_file_for()

It necessarily changes some internal e-util API:
 • e_util_get_searchable_categories() to
   e_util_dup_searchable_categories()

This bumps the EDS requirement to 3.13.1.

https://bugzilla.gnome.org/show_bug.cgi?id=727221

1 files changed, 5 insertions, 4 deletions

diff --git a/e-util/e-categories-selector.c b/e-util/e-categories-selector.c
index 454421c7a8..e014e7d8c5 100644
--- a/e-util/e-categories-selector.c
+++ b/e-util/e-categories-selector.c
@@ -71,10 +71,10 @@ categories_selector_build_model (ECategoriesSelector *selector)
 		GTK_TREE_SORTABLE (store),
 		COLUMN_CATEGORY, GTK_SORT_ASCENDING);
 
-	list = e_categories_get_list ();
+	list = e_categories_dup_list ();
 	for (iter = list; iter != NULL; iter = iter->next) {
 		const gchar *category_name = iter->data;
-		const gchar *filename;
+		gchar *filename;
 		GdkPixbuf *pixbuf = NULL;
 		GtkTreeIter iter;
 		gboolean active;
@@ -87,9 +87,10 @@ categories_selector_build_model (ECategoriesSelector *selector)
 				selector->priv->selected_categories,
 				category_name) != NULL);
 
-		filename = e_categories_get_icon_file_for (category_name);
+		filename = e_categories_dup_icon_file_for (category_name);
 		if (filename != NULL)
 			pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
+		g_free (filename);
 
 		gtk_list_store_append (store, &iter);
 
@@ -111,7 +112,7 @@ categories_selector_build_model (ECategoriesSelector *selector)
 	gtk_tree_view_set_search_column (
 		GTK_TREE_VIEW (selector), COLUMN_CATEGORY);
 
-	g_list_free (list);
+	g_list_free_full (list, g_free);
 	g_object_unref (store);
 }