ext/timidity/gstwildmidi.c: Check some more common locations for a valid configuration file.

Original commit message from CVS:
* ext/timidity/gstwildmidi.c: (wildmidi_open_config):
Check some more common locations for a valid configuration file.
Fixes bug #533435. Packagers should still #define WILDMIDI_CFG
to the distributions default location.

1 files changed, 22 insertions, 0 deletions

diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c
index 66d545f23..1544d1aa0 100644
--- a/ext/timidity/gstwildmidi.c
+++ b/ext/timidity/gstwildmidi.c
@@ -163,6 +163,17 @@ wildmidi_open_config ()
   }
 
   if (path == NULL) {
+    path =
+        g_build_path (G_DIR_SEPARATOR_S, "/etc", "wildmidi", "wildmidi.cfg",
+        NULL);
+    GST_DEBUG ("trying %s", path);
+    if (path && (g_access (path, R_OK) == -1)) {
+      g_free (path);
+      path = NULL;
+    }
+  }
+
+  if (path == NULL) {
     path = g_strdup (WILDMIDI_CFG);
     GST_DEBUG ("trying %s", path);
     if (path && (g_access (path, R_OK) == -1)) {
@@ -181,6 +192,17 @@ wildmidi_open_config ()
   }
 
   if (path == NULL) {
+    path =
+        g_build_path (G_DIR_SEPARATOR_S, "/etc", "timidity", "timidity.cfg",
+        NULL);
+    GST_DEBUG ("trying %s", path);
+    if (path && (g_access (path, R_OK) == -1)) {
+      g_free (path);
+      path = NULL;
+    }
+  }
+
+  if (path == NULL) {
     /* I've created a symlink to get it playing
      * ln -s /usr/share/timidity/timidity.cfg /etc/wildmidi.cfg
      * we could make it use : WILDMIDI_CFG