Canonicalising FDE paths & replacing printlns with tracing::error macro

Author: ellieplayswow

cosmic-settings/src/pages/system/default_apps.rs

@@ -256,18 +256,20 @@ impl Page {
                             match system_actions {
                                 Err(e) => {
                                     // we don't have system_actions set?
-                                    println!("{}", e);
+                                    tracing::error!(?e, "Unable to get system_actions shortcuts config");
                                 }
                                 Ok(mut actions) => {
                                     let default_paths = default_paths();
                                     let mut resolved_path = None;
 
                                     // loop through all FDE paths to try and find a valid .desktop file
                                     for path in default_paths {
-                                        let full_path = path.join([appid, ".desktop"].concat());
-                                        if full_path.exists() && full_path.is_file() {
-                                            resolved_path = Some(full_path);
-                                            break;
+                                        if let Ok(mut full_path) = path.canonicalize() {
+                                            full_path = full_path.join([appid, ".desktop"].concat());
+                                            if full_path.exists() && full_path.is_file() {
+                                                resolved_path = Some(full_path);
+                                                break;
+                                            }
                                         }
                                     }
 
@@ -279,7 +281,7 @@ impl Page {
                                                 actions.insert(System::Terminal, String::from(exec));
 
                                                 if let Err(e) = shortcuts.set("system_actions", actions) {
-                                                    println!("{}", e);
+                                                    tracing::error!(?e, "Unable to set system_actions shortcuts config");
                                                 }
                                             }