diff options
author | Philip Withnall <philip.withnall@collabora.co.uk> | 2014-03-28 17:14:23 +0800 |
---|---|---|
committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2014-03-28 18:44:44 +0800 |
commit | 61b4bacf9a16bf69c26999dd9acac99695d23242 (patch) | |
tree | 01ec1df06524350dc665913445f14bbf8e0dad58 /calendar/gui/e-cal-component-preview.c | |
parent | ed405f45a5b870b0374f8f714023e1647a1a6701 (diff) | |
download | gsoc2013-evolution-61b4bacf9a16bf69c26999dd9acac99695d23242.tar gsoc2013-evolution-61b4bacf9a16bf69c26999dd9acac99695d23242.tar.gz gsoc2013-evolution-61b4bacf9a16bf69c26999dd9acac99695d23242.tar.bz2 gsoc2013-evolution-61b4bacf9a16bf69c26999dd9acac99695d23242.tar.lz gsoc2013-evolution-61b4bacf9a16bf69c26999dd9acac99695d23242.tar.xz gsoc2013-evolution-61b4bacf9a16bf69c26999dd9acac99695d23242.tar.zst gsoc2013-evolution-61b4bacf9a16bf69c26999dd9acac99695d23242.zip |
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
Diffstat (limited to 'calendar/gui/e-cal-component-preview.c')
-rw-r--r-- | calendar/gui/e-cal-component-preview.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index cdfaeeaf17..fa1aca0253 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -230,9 +230,9 @@ cal_component_preview_write_html (ECalComponentPreview *preview, g_string_append_printf (buffer, "<tr><th>%s</th><td>", _("Categories:")); for (iter = list; iter != NULL; iter = iter->next) { const gchar *category = iter->data; - const gchar *icon_file; + gchar *icon_file; - icon_file = e_categories_get_icon_file_for (category); + icon_file = e_categories_dup_icon_file_for (category); if (icon_file && g_file_test (icon_file, G_FILE_TEST_EXISTS)) { gchar *uri; @@ -246,6 +246,8 @@ cal_component_preview_write_html (ECalComponentPreview *preview, g_string_append_len (string, ", ", 2); g_string_append (string, category); } + + g_free (icon_file); } if (string->len > 0) g_string_append_printf (buffer, "%s", string->str); |