# HG changeset patch
# User William Pitcock <nenolod@atheme.org>
# Date 1183125512 18000
# Node ID d9a2434375f1fc474fc35d56cdece6c5cea35471
# Parent  b51cc33881c2e046f0d185e81489a5d677f64119# Parent  1cdfc508d7587873786c5f56df951a91ee837597
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r b51cc33881c2 -r d9a2434375f1 src/audacious/main.c
--- a/src/audacious/main.c	Fri Jun 29 08:57:43 2007 -0500
+++ b/src/audacious/main.c	Fri Jun 29 08:58:32 2007 -0500
@@ -1130,16 +1130,6 @@
     bmp_init_paths();
     bmp_make_user_dir();
 
-    /* Check GTK version. Really, this is only needed for binary
-     * distribution since configure already checks. */
-    if (!GTK_CHECK_VERSION(2, 6, 0)) {
-        g_printerr(_("Sorry, your GTK+ version (%d.%d.%d) does not work with Audacious.\n"
-                     "Please use GTK+ %s or newer.\n"),
-                   gtk_major_version, gtk_minor_version, gtk_micro_version,
-                   "2.6.0");
-        exit(EXIT_FAILURE);
-    }
-
     g_set_application_name(_(application_name));
 
     cond_scan = g_cond_new();
@@ -1159,7 +1149,8 @@
 
     if (error != NULL)
     {
-        g_printerr(_("%s: %s\nTry `%s --help' for more information.\n"), argv[0], error->message, argv[0]);
+        g_printerr(_("%s: %s\nTry `%s --help' for more information.\n"),
+	  argv[0], error->message, argv[0]);
         exit(EXIT_FAILURE);
     }
 
@@ -1176,7 +1167,7 @@
 
         /* we could be running headless, so GTK probably wont matter */
         if (options.headless != 1)
-          exit(EXIT_SUCCESS);
+            exit(EXIT_SUCCESS);
     }
 
     if (options.no_log == FALSE)
diff -r b51cc33881c2 -r d9a2434375f1 src/libaudclient/audctrl.c
--- a/src/libaudclient/audctrl.c	Fri Jun 29 08:57:43 2007 -0500
+++ b/src/libaudclient/audctrl.c	Fri Jun 29 08:58:32 2007 -0500
@@ -64,7 +64,10 @@
  * Sends a list of URIs to Audacious to add to the playlist.
  **/
 void audacious_remote_playlist_add(DBusGProxy *proxy, GList *list) {
-//XXX
+	GList *iter;
+	for (iter = list; iter != NULL; iter = g_list_next(iter))
+		org_atheme_audacious_add(proxy, iter->data, &error);
+	g_clear_error(&error);
 }
 
 /**