# HG changeset patch
# User nenolod
# Date 1168829625 28800
# Node ID 593fd166af002e904eb89237f06d78b8d85746e9
# Parent  d7ccaa59630f5b5c2f9608a56877a3be924bd918
[svn] - warning cleanups

diff -r d7ccaa59630f -r 593fd166af00 ChangeLog
--- a/ChangeLog	Sun Jan 14 10:54:06 2007 -0800
+++ b/ChangeLog	Sun Jan 14 18:53:45 2007 -0800
@@ -1,3 +1,12 @@
+2007-01-14 18:54:06 +0000  Michael Farber <01mf02@gmail.com>
+  revision [3672]
+  Wiped out some error messages
+  trunk/src/audacious/input.c        |   36 +++++++++++++++++-------------------
+  trunk/src/audacious/ui_equalizer.c |   14 --------------
+  trunk/src/audacious/util.c         |    3 ---
+  3 files changed, 17 insertions(+), 36 deletions(-)
+
+
 2007-01-14 10:50:21 +0000  Michael Farber <01mf02@gmail.com>
   revision [3670]
   Added myself to the developer list
diff -r d7ccaa59630f -r 593fd166af00 src/audacious/strings.c
--- a/src/audacious/strings.c	Sun Jan 14 10:54:06 2007 -0800
+++ b/src/audacious/strings.c	Sun Jan 14 18:53:45 2007 -0800
@@ -66,9 +66,6 @@
 #endif
 #endif
 
-static GQuark quark_popup_data;
-
-
 /*
  * escape_shell_chars()
  *
diff -r d7ccaa59630f -r 593fd166af00 src/audacious/util.c
--- a/src/audacious/util.c	Sun Jan 14 10:54:06 2007 -0800
+++ b/src/audacious/util.c	Sun Jan 14 18:53:45 2007 -0800
@@ -1431,8 +1431,8 @@
     if (dblimg->bpp == 1) {
 	register guint8 *srcptr, *ptr, *ptr2, pix;
 
-	srcptr = GDK_IMAGE_XIMAGE(img)->data;
-	ptr = GDK_IMAGE_XIMAGE(dblimg)->data;
+	srcptr = GDK_IMAGE(img)->mem;
+	ptr = GDK_IMAGE(dblimg)->mem;
 	ptr2 = ptr + dblimg->bpl;
 
 	for (y = 0; y < img->height; y++) {
@@ -1471,8 +1471,8 @@
     if (dblimg->bpp == 3) {
 	register guint8 *srcptr, *ptr, *ptr2, pix1, pix2, pix3;
 
-	srcptr = GDK_IMAGE_XIMAGE(img)->data;
-	ptr = GDK_IMAGE_XIMAGE(dblimg)->data;
+	srcptr = GDK_IMAGE(img)->mem;
+	ptr = GDK_IMAGE(dblimg)->mem;
 	ptr2 = ptr + dblimg->bpl;
 
 	for (y = 0; y < img->height; y++) {
@@ -1502,8 +1502,8 @@
     if (dblimg->bpp == 4) {
 	register guint32 *srcptr, *ptr, *ptr2, pix;
 
-	srcptr = (guint32 *) GDK_IMAGE_XIMAGE(img)->data;
-	ptr = (guint32 *) GDK_IMAGE_XIMAGE(dblimg)->data;
+	srcptr = (guint32 *) GDK_IMAGE(img)->mem;
+	ptr = (guint32 *) GDK_IMAGE(dblimg)->mem;
 	ptr2 = ptr + (dblimg->bpl >> 2);
 
 	for (y = 0; y < img->height; y++) {
diff -r d7ccaa59630f -r 593fd166af00 src/audacious/vfs_buffer.c
--- a/src/audacious/vfs_buffer.c	Sun Jan 14 10:54:06 2007 -0800
+++ b/src/audacious/vfs_buffer.c	Sun Jan 14 18:53:45 2007 -0800
@@ -206,7 +206,6 @@
     g_return_val_if_fail(size > 0, NULL);
 
     handle = g_new0(VFSFile, 1);
-    handle->uri == NULL;
 
     buffer = g_new0(VFSBuffer, 1);
     buffer->data = data;