# HG changeset patch
# User Tomasz Mon <desowin@gmail.com>
# Date 1201038102 -3600
# Node ID 56e189ecb47748110878507e76aa315843a41640
# Parent  47352b34dbdfd974b1082c78e54c71a3371b0a44# Parent  408b520f39fd867a01828123205fe66174572d12
branch merge

diff -r 47352b34dbdf -r 56e189ecb477 contrib/macpack/.DS_Store
Binary file contrib/macpack/.DS_Store has changed
diff -r 47352b34dbdf -r 56e189ecb477 contrib/macpack/Audacious.app/Contents/Info.plist
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/macpack/Audacious.app/Contents/Info.plist	Tue Jan 22 22:41:42 2008 +0100
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>Audacious</string>
+	<key>CFBundleExecutable</key>
+	<string>Audacious</string>
+	<key>CFBundleIconFile</key>
+	<string>Audacious.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.atheme.audacious</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>1.4.5</string>
+	<key>CFBundleName</key>
+	<string>Audacious</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.4</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2008 Atheme.org
+All Rights Reserved.</string>
+</dict>
+</plist>
diff -r 47352b34dbdf -r 56e189ecb477 contrib/macpack/Audacious.app/Contents/PkgInfo
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/macpack/Audacious.app/Contents/PkgInfo	Tue Jan 22 22:41:42 2008 +0100
@@ -0,0 +1,1 @@
+Audacious
\ No newline at end of file
diff -r 47352b34dbdf -r 56e189ecb477 contrib/macpack/Audacious.app/Contents/Resources/Audacious.icns
Binary file contrib/macpack/Audacious.app/Contents/Resources/Audacious.icns has changed
diff -r 47352b34dbdf -r 56e189ecb477 contrib/macpack/Audacious.app/Contents/version.plist
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/macpack/Audacious.app/Contents/version.plist	Tue Jan 22 22:41:42 2008 +0100
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildVersion</key>
+	<string>12</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.4</string>
+	<key>CFBundleVersion</key>
+	<string>220</string>
+	<key>ProjectName</key>
+	<string>Audacious</string>
+	<key>SourceVersion</key>
+	<string>1337</string>
+</dict>
+</plist>
diff -r 47352b34dbdf -r 56e189ecb477 src/audacious/input.c
--- a/src/audacious/input.c	Tue Jan 22 22:40:48 2008 +0100
+++ b/src/audacious/input.c	Tue Jan 22 22:41:42 2008 +0100
@@ -516,11 +516,11 @@
                     return pr;
                 }
             }
+        }
 
-	    g_free(filename_proxy);
-	    vfs_fclose(fd);
-	    return NULL; // no plugin found.
-        }
+        g_free(filename_proxy);
+        vfs_fclose(fd);
+        return NULL; // no plugin found.
     }