Mercurial > audlegacy
changeset 2941:d9a2434375f1 trunk
Automated merge with ssh://hg.atheme.org//hg/audacious
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Fri, 29 Jun 2007 08:58:32 -0500 |
| parents | b51cc33881c2 (current diff) 1cdfc508d758 (diff) |
| children | 1a59a0ced6a8 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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); } /**