# HG changeset patch
# User Jonathan Schleifer <js@h3c.de>
# Date 1190730427 -7200
# Node ID 5481a48b31015034a0471c267cfa60e6f3168aea
# Parent  05648eaa2e1f07f2f0219dd559d673c3b37f9871# Parent  9038c338ebc250667356c01589c3d8d870c1f077
Automated merge with ssh://sidhe.atheme.org//hg/audacious

diff -r 9038c338ebc2 -r 5481a48b3101 configure.ac
--- a/configure.ac	Tue Sep 25 20:51:50 2007 +0930
+++ b/configure.ac	Tue Sep 25 16:27:07 2007 +0200
@@ -150,24 +150,6 @@
 fi
 AC_SUBST(PCH)
 
-dnl rpath stuff
-dnl ========================
-AC_ARG_ENABLE(rpath,
-	[  --disable-rpath                disable hardcoded rpath (default=enabled)],
-			enable_rpath=$enableval, enable_rpath=yes)
-
-if test "x$enable_rpath" = xyes; then
-    case "$target" in
-    *-apple-*)
-        ;;
-    *)
-        RPATH_VAL="-Wl,-rpath=\${libdir}"
-        ;;
-    esac
-fi
-
-AC_SUBST(RPATH_VAL)
-
 dnl plugin stuff
 dnl ========================
 
@@ -180,13 +162,6 @@
 AC_DEFINE_UNQUOTED(SHARED_SUFFIX, "${SHARED_SUFFIX}",
 	[Define the shared module suffix extension on your platform.])
 
-# Use -rpath?
-AC_ARG_ENABLE(rpath,
-	      [  --enable-rpath	   enable use of -rpath on ELF systems (default=yes)], [enable_rpath=$enableval], [enable_rpath=no])
-if test "x$enable_rpath" = "xyes"; then
-	test x"`$CC -dM -E - </dev/null | grep __ELF__`" != x"" && LDFLAGS="$LDFLAGS -Wl,-rpath $libdir"
-fi
-
 AC_MSG_CHECKING([if you are running Apple-GCC])
 case "$target" in
 	*-apple-*)
@@ -449,6 +424,13 @@
        AC_DEFINE(HAVE_XSPF_PLAYLIST, 1, [Define if XSPF playlists are available.])
 fi
 
+# Use -rpath?
+AC_ARG_ENABLE(rpath,
+	      [  --enable-rpath	   enable use of -rpath on ELF systems (default=yes)], [enable_rpath=$enableval], [enable_rpath=no])
+if test "x$enable_rpath" = "xyes"; then
+	test x"`$CC -dM -E - </dev/null | grep __ELF__`" != x"" && LDFLAGS="$LDFLAGS -Wl,-rpath $libdir"
+fi
+
 AC_SUBST(beepdir)
 AC_SUBST(plugindir)
 
diff -r 9038c338ebc2 -r 5481a48b3101 src/audacious/skin.c
--- a/src/audacious/skin.c	Tue Sep 25 20:51:50 2007 +0930
+++ b/src/audacious/skin.c	Tue Sep 25 16:27:07 2007 +0200
@@ -1473,11 +1473,8 @@
     if (!g_file_test(path, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_DIR))
         return FALSE;
    
-    if (!force) {
-        if (skin->path)
-            if (!strcmp(skin->path, path))
-                return FALSE;
-    }
+    if (!force && skin->path && !strcmp(skin->path, path))
+	return FALSE;
       
     skin_current_num++;