# HG changeset patch
# User nenolod
# Date 1161388686 25200
# Node ID 94795106c5415f11b4c95cccd19fbd6a3a5cd046
# Parent  cbc1df98c5b6f486798a78126db404eaf0f47958
[svn] - icc warning fixes (pass 1)

diff -r cbc1df98c5b6 -r 94795106c541 ChangeLog
--- a/ChangeLog	Sun Oct 15 09:58:41 2006 -0700
+++ b/ChangeLog	Fri Oct 20 16:58:06 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-15 16:58:41 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2729]
+  - try coreaudio before OSS
+  
+  trunk/audacious/main.c |    2 +-
+  1 file changed, 1 insertion(+), 1 deletion(-)
+
+
 2006-10-15 16:30:05 +0000  Tony Vroon <chainsaw@gentoo.org>
   revision [2727]
   Jump to track window shown when calling audacious with the -j option. Patch by Henrik Johansson <henrik_johansson@home.se>, submitted as Gentoo bug #151260.
diff -r cbc1df98c5b6 -r 94795106c541 audacious/util.c
--- a/audacious/util.c	Sun Oct 15 09:58:41 2006 -0700
+++ b/audacious/util.c	Fri Oct 20 16:58:06 2006 -0700
@@ -1551,15 +1551,15 @@
 	GdkPixmap *out;
 	gint owidth, oheight;
 
-	g_return_if_fail(src != NULL);
-	g_return_if_fail(src_gc != NULL);
-	g_return_if_fail(in != NULL);
-	g_return_if_fail(width > 0 && height > 0);
+	g_return_val_if_fail(src != NULL, NULL);
+	g_return_val_if_fail(src_gc != NULL, NULL);
+	g_return_val_if_fail(in != NULL, NULL);
+	g_return_val_if_fail(width > 0 && height > 0, NULL);
 
 	gdk_drawable_get_size(in, &owidth, &oheight);
 
 	if (oheight == height && owidth == width)
-		return;
+		return NULL;
 
 	out = gdk_pixmap_new(src, width, height, -1);
 
diff -r cbc1df98c5b6 -r 94795106c541 audacious/widgets/playlist_list.c
--- a/audacious/widgets/playlist_list.c	Sun Oct 15 09:58:41 2006 -0700
+++ b/audacious/widgets/playlist_list.c	Fri Oct 20 16:58:06 2006 -0700
@@ -100,8 +100,7 @@
 	GdkPixmap *p;
 	GdkGC *gc;
 
-	if (in == NULL)
-		return;
+	g_return_val_if_fail(in != NULL, NULL);
 
 	p = gdk_pixmap_new(in, w, h, -1);
 	gc = gdk_gc_new(p);