50 lines
2.3 KiB
Diff
50 lines
2.3 KiB
Diff
diff --git a/src/functions.vala b/src/functions.vala
|
|
index cf7fefc..9b4d82a 100644
|
|
--- a/src/functions.vala
|
|
+++ b/src/functions.vala
|
|
@@ -102,10 +102,7 @@ namespace SwayNotificationCenter {
|
|
|
|
public static string get_style_path (owned string ? custom_path,
|
|
bool only_system = false) {
|
|
- string[] paths = {
|
|
- // Fallback location. Specified in postinstall.py
|
|
- "/usr/local/etc/xdg/swaync/style.css"
|
|
- };
|
|
+ string[] paths = {};
|
|
if (custom_path != null && custom_path.length > 0) {
|
|
// Replaces the home directory relative path with a absolute path
|
|
if (custom_path.get (0) == '~') {
|
|
@@ -123,7 +120,9 @@ namespace SwayNotificationCenter {
|
|
paths += Path.build_path (Path.DIR_SEPARATOR.to_string (),
|
|
path, "swaync/style.css");
|
|
}
|
|
-
|
|
+ // Fallback location. Specified in postinstall.py. Mostly for Debian
|
|
+ paths += "/usr/local/etc/xdg/swaync/style.css";
|
|
+
|
|
string path = "";
|
|
foreach (string try_path in paths) {
|
|
if (File.new_for_path (try_path).query_exists ()) {
|
|
@@ -140,10 +139,7 @@ namespace SwayNotificationCenter {
|
|
}
|
|
|
|
public static string get_config_path (owned string ? custom_path) {
|
|
- string[] paths = {
|
|
- // Fallback location. Specified in postinstall.py
|
|
- "/usr/local/etc/xdg/swaync/config.json"
|
|
- };
|
|
+ string[] paths = {};
|
|
if (custom_path != null && custom_path.length > 0) {
|
|
// Replaces the home directory relative path with a absolute path
|
|
if (custom_path.get (0) == '~') {
|
|
@@ -158,7 +154,9 @@ namespace SwayNotificationCenter {
|
|
paths += Path.build_path (Path.DIR_SEPARATOR.to_string (),
|
|
path, "swaync/config.json");
|
|
}
|
|
-
|
|
+ // Fallback location. Specified in postinstall.py. Mostly for Debian
|
|
+ paths += "/usr/local/etc/xdg/swaync/config.json";
|
|
+
|
|
string path = "";
|
|
foreach (string try_path in paths) {
|
|
if (File.new_for_path (try_path).query_exists ()) {
|