# HG changeset patch
# User Jonathan Schleifer <js@h3c.de>
# Date 1190380689 -7200
# Node ID ed6ec0e94afc1be54ebb7919ea524a819facaff8
# Parent  ddb15c329985eafb1c23eab087e588d61ce025de# Parent  8e50c2cd44f039c1dee3578aa8f0d052366fdd2e
Automated merge with ssh://sidhe.atheme.org//hg/audacious

diff -r ddb15c329985 -r ed6ec0e94afc icons/.depend
diff -r ddb15c329985 -r ed6ec0e94afc icons/.depend-done
diff -r ddb15c329985 -r ed6ec0e94afc skins/Classic/.depend
diff -r ddb15c329985 -r ed6ec0e94afc skins/Classic/.depend-done
diff -r ddb15c329985 -r ed6ec0e94afc skins/Default/.depend
diff -r ddb15c329985 -r ed6ec0e94afc skins/Default/.depend-done
diff -r ddb15c329985 -r ed6ec0e94afc skins/Ivory/.depend
diff -r ddb15c329985 -r ed6ec0e94afc skins/Ivory/.depend-done
diff -r ddb15c329985 -r ed6ec0e94afc skins/Osmosis/.depend
diff -r ddb15c329985 -r ed6ec0e94afc skins/Osmosis/.depend-done
diff -r ddb15c329985 -r ed6ec0e94afc skins/TinyPlayer/.depend
diff -r ddb15c329985 -r ed6ec0e94afc skins/TinyPlayer/.depend-done
diff -r ddb15c329985 -r ed6ec0e94afc src/Makefile
--- a/src/Makefile	Fri Sep 21 15:17:48 2007 +0200
+++ b/src/Makefile	Fri Sep 21 15:18:09 2007 +0200
@@ -3,7 +3,7 @@
 include ../extra.mk
 
 ifdef USE_DBUS
-SUBDIRS += libaudclient audtool
+SUBDIRS := libaudclient audtool $(SUBDIRS)
 endif
 
 include ../buildsys.mk
diff -r ddb15c329985 -r ed6ec0e94afc src/audacious/logger.c
--- a/src/audacious/logger.c	Fri Sep 21 15:17:48 2007 +0200
+++ b/src/audacious/logger.c	Fri Sep 21 15:18:09 2007 +0200
@@ -57,6 +57,7 @@
 static LogHandler log_handlers[] = {
     {NULL, LOG_ALL_LEVELS, 0},
     {"Glib", LOG_ALL_LEVELS, 0},
+    {"GThread", LOG_ALL_LEVELS, 0},
     {"Gtk", LOG_ALL_LEVELS, 0}
 };
 
diff -r ddb15c329985 -r ed6ec0e94afc src/audacious/playlist.c
--- a/src/audacious/playlist.c	Fri Sep 21 15:17:48 2007 +0200
+++ b/src/audacious/playlist.c	Fri Sep 21 15:18:09 2007 +0200
@@ -676,17 +676,17 @@
     if (tuple != NULL)
     {
         subtunes_num = tuple_get_int(tuple, FIELD_SUBSONG_NUM, NULL);
-        if ( subtunes_num > 0 )
+        if (subtunes_num > 0)
         {
             i = 1;
             tuple_free(tuple); /* will be replaced by subtune tuples */
         }
     }
 
-    for ( ; i <= subtunes_num ; i++ )
+    for (; i <= subtunes_num; i++)
     {
         gchar *filename_entry;
-        if ( subtunes_num > 0 )
+        if (subtunes_num > 0)
         {
             filename_entry = g_strdup_printf("%s?%d", filename, i);
             /* we're dealing with subtune, let's ask again tuple information
@@ -695,10 +695,9 @@
             tuple = dec->get_song_tuple(filename_entry);
         }
         else
-        {
             filename_entry = g_strdup(filename);
-        }
-
+        
+        
         entry = playlist_entry_new(filename_entry,
             tuple ? tuple_get_string(tuple, FIELD_TITLE, NULL) : NULL,
             tuple ? tuple_get_int(tuple, FIELD_LENGTH, NULL) : -1, dec);