# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1190302068 18000
# Node ID 4ee9f4c9f90549dba97601fdfac9fcc14c10dab4
# Parent  978fbda4855f03da0e206f004ec44c8271d52979# Parent  7d0adad41792a7e744dcca1f7e171a7745a9a039
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r 7d0adad41792 -r 4ee9f4c9f905 Skins/Classic/.depend
diff -r 7d0adad41792 -r 4ee9f4c9f905 Skins/Classic/.depend-done
diff -r 7d0adad41792 -r 4ee9f4c9f905 Skins/Default/.depend
diff -r 7d0adad41792 -r 4ee9f4c9f905 Skins/Default/.depend-done
diff -r 7d0adad41792 -r 4ee9f4c9f905 Skins/Ivory/.depend
diff -r 7d0adad41792 -r 4ee9f4c9f905 Skins/Ivory/.depend-done
diff -r 7d0adad41792 -r 4ee9f4c9f905 Skins/Osmosis/.depend
diff -r 7d0adad41792 -r 4ee9f4c9f905 Skins/Osmosis/.depend-done
diff -r 7d0adad41792 -r 4ee9f4c9f905 Skins/TinyPlayer/.depend
diff -r 7d0adad41792 -r 4ee9f4c9f905 Skins/TinyPlayer/.depend-done
diff -r 7d0adad41792 -r 4ee9f4c9f905 pixmaps/.depend
diff -r 7d0adad41792 -r 4ee9f4c9f905 pixmaps/.depend-done
diff -r 7d0adad41792 -r 4ee9f4c9f905 src/audacious/logger.c
--- a/src/audacious/logger.c	Thu Sep 20 08:44:52 2007 +0000
+++ b/src/audacious/logger.c	Thu Sep 20 10:27:48 2007 -0500
@@ -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 7d0adad41792 -r 4ee9f4c9f905 src/audacious/tuple.c
diff -r 7d0adad41792 -r 4ee9f4c9f905 src/audacious/tuple.h