# HG changeset patch
# User nenolod
# Date 1155600818 25200
# Node ID dae6b30c0148b965d32df76f8ecad59d2b24e301
# Parent  d60e3dbe1a48370a645012554221e2f64049ae3f
[svn] - gcc 4.1.1 fix

diff -r d60e3dbe1a48 -r dae6b30c0148 ChangeLog
--- a/ChangeLog	Sat Aug 12 20:00:08 2006 -0700
+++ b/ChangeLog	Mon Aug 14 17:13:38 2006 -0700
@@ -1,3 +1,12 @@
+2006-08-13 03:00:08 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
+  revision [2073]
+  - better handling for file name which can't be represented correctly in current locale encoding.
+  
+
+  Changes:        Modified:
+  +10 -3          trunk/Plugins/Container/xspf/xspf.c  
+
+
 2006-08-12 23:46:09 +0000  George Averill <nhjm449@gmail.com>
   revision [2071]
   - Show the filename if there's no track_name
diff -r d60e3dbe1a48 -r dae6b30c0148 audacious/controlsocket.c
--- a/audacious/controlsocket.c	Sat Aug 12 20:00:08 2006 -0700
+++ b/audacious/controlsocket.c	Mon Aug 14 17:13:38 2006 -0700
@@ -246,12 +246,8 @@
 write_all(gint fd, gconstpointer buf, size_t count)
 {
     size_t left = count;
-    GTimer *timer;
-    gulong usec;
     gint written;
 
-    timer = g_timer_new();
-
     do {
         if ((written = write(fd, buf, left)) < 0) {
             count = -1;
@@ -259,11 +255,9 @@
         }
         left -= written;
         buf = (gchar *) buf + written;
-        g_timer_elapsed(timer, &usec);
     }
-    while (left > 0 && usec <= CTRLSOCKET_IO_TIMEOUT_USEC);
+    while (left > 0);
 
-    g_timer_destroy(timer);
     return count - left;
 }