From 528da51f296a93443d980515df25379043103578 Mon Sep 17 00:00:00 2001 From: Thaddaeus Tintenfisch Date: Sun, 25 Jan 2015 11:04:27 +0100 Subject: [PATCH] Update mimeapps.list location for glib >= 2.41 (Bug #11293) --- dialogs/mime-settings/xfce-mime-window.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dialogs/mime-settings/xfce-mime-window.c b/dialogs/mime-settings/xfce-mime-window.c index b8916e5..a4e6fc2 100644 --- a/dialogs/mime-settings/xfce-mime-window.c +++ b/dialogs/mime-settings/xfce-mime-window.c @@ -407,9 +407,14 @@ xfce_mime_window_mime_user (void) table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); - filename = xfce_resource_save_location (XFCE_RESOURCE_DATA, "applications/mimeapps.list", FALSE); + filename = xfce_resource_save_location (XFCE_RESOURCE_CONFIG, "mimeapps.list", FALSE); if (filename == NULL) - return table; + { + /* deprecated location (glib < 2.41) */ + filename = xfce_resource_save_location (XFCE_RESOURCE_DATA, "applications/mimeapps.list", FALSE); + if (filename == NULL) + return table; + } rc = xfce_rc_simple_open (filename, TRUE); g_free (filename); -- 2.1.4