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 /e-util/e-category-editor.c | |
| parent | ed405f45a5b870b0374f8f714023e1647a1a6701 (diff) | |
| download | gsoc2013-evolution-61b4bacf9a16bf69c26999dd9acac99695d23242.tar.gz 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 'e-util/e-category-editor.c')
| -rw-r--r-- | e-util/e-category-editor.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/e-util/e-category-editor.c b/e-util/e-category-editor.c index 7d4223d3e8..708ba5c890 100644 --- a/e-util/e-category-editor.c +++ b/e-util/e-category-editor.c @@ -304,7 +304,7 @@ e_category_editor_edit_category (ECategoryEditor *editor, const gchar *category) { GtkFileChooser *file_chooser; - const gchar *icon_file; + gchar *icon_file; g_return_val_if_fail (E_IS_CATEGORY_EDITOR (editor), FALSE); g_return_val_if_fail (category != NULL, FALSE); @@ -314,11 +314,12 @@ e_category_editor_edit_category (ECategoryEditor *editor, gtk_entry_set_text (GTK_ENTRY (editor->priv->category_name), category); gtk_widget_set_sensitive (editor->priv->category_name, FALSE); - icon_file = e_categories_get_icon_file_for (category); + icon_file = e_categories_dup_icon_file_for (category); if (icon_file) { gtk_file_chooser_set_filename (file_chooser, icon_file); update_preview (file_chooser, NULL); } + g_free (icon_file); if (gtk_dialog_run (GTK_DIALOG (editor)) == GTK_RESPONSE_OK) { gchar *category_icon; |