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 /shell | |
| 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 'shell')
| -rw-r--r-- | shell/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/shell/main.c b/shell/main.c index 29a7364a25..3125cd55b2 100644 --- a/shell/main.c +++ b/shell/main.c @@ -115,7 +115,7 @@ categories_icon_theme_hack (void) { GtkIconTheme *icon_theme; const gchar *category_name; - const gchar *filename; + gchar *filename; gchar *dirname; /* XXX Allow the category icons to be referenced as named @@ -125,11 +125,12 @@ categories_icon_theme_hack (void) * which, so long as it has an icon. We're just interested in * the directory components. */ category_name = _("Birthday"); - filename = e_categories_get_icon_file_for (category_name); + filename = e_categories_dup_icon_file_for (category_name); g_return_if_fail (filename != NULL && *filename != '\0'); /* Extract the directory components. */ dirname = g_path_get_dirname (filename); + g_free (filename); /* Add it to the icon theme's search path. This relies on * GtkIconTheme's legacy feature of using image files found |