# HG changeset patch
# User Jonathan Schleifer <js@h3c.de>
# Date 1191111412 -7200
# Node ID 75ba6205aab3c46fb460d90fb0a10b1fa824637a
# Parent  9ea88bd211c2b121292c9b16231d06a534d612e7# Parent  271ed550c5b3266eb77b248c0908a29e67156d64
Automated merge with ssh://sidhe.atheme.org//hg/audacious-plugins

diff -r 9ea88bd211c2 -r 75ba6205aab3 src/lirc/about.c
--- a/src/lirc/about.c	Sun Sep 30 02:16:32 2007 +0200
+++ b/src/lirc/about.c	Sun Sep 30 02:16:52 2007 +0200
@@ -23,9 +23,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #include <glib.h>
 #include <audacious/i18n.h>
diff -r 9ea88bd211c2 -r 75ba6205aab3 src/lirc/lirc.c
--- a/src/lirc/lirc.c	Sun Sep 30 02:16:32 2007 +0200
+++ b/src/lirc/lirc.c	Sun Sep 30 02:16:52 2007 +0200
@@ -24,9 +24,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <unistd.h>
diff -r 9ea88bd211c2 -r 75ba6205aab3 src/pulse_audio/pulse_audio.c
--- a/src/pulse_audio/pulse_audio.c	Sun Sep 30 02:16:32 2007 +0200
+++ b/src/pulse_audio/pulse_audio.c	Sun Sep 30 02:16:52 2007 +0200
@@ -17,9 +17,7 @@
   USA.
 ***/
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
 
 #include <stdio.h>
 #include <assert.h>
diff -r 9ea88bd211c2 -r 75ba6205aab3 src/scrobbler/fmt.c
--- a/src/scrobbler/fmt.c	Sun Sep 30 02:16:32 2007 +0200
+++ b/src/scrobbler/fmt.c	Sun Sep 30 02:16:52 2007 +0200
@@ -10,7 +10,7 @@
 char *fmt_escape(const char *str)
 {
 	if (str == NULL)
-		return "";
+		return NULL;
 
 	return curl_escape(str, 0);
 }
@@ -18,7 +18,7 @@
 char *fmt_unescape(char *str)
 {
 	if (str == NULL)
-		return "";
+		return NULL;
 
 	return curl_unescape(str, 0);
 }