[Xfce4-commits] [xfce/xfce4-settings] 01/02: Update mimeapps.list location for glib >= 2.41 (Bug #11293)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

bluesabre pushed a commit to branch master
in repository xfce/xfce4-settings.

commit 5bf53495786515b8693d93614bb5845268739e1a
Author: Thaddaeus Tintenfisch <thad.fisch at gmail.com>
Date:   Sun Jan 25 11:04:27 2015 +0100

    Update mimeapps.list location for glib >= 2.41 (Bug #11293)
    
    Signed-off-by: Sean Davis <smd.seandavis at gmail.com>
---
 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);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.