X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/b0b15b7ced28b3c6ddfcd4b0a7e46ee6432a243c..ada57e739dcd4a90cf5809e5fe08473f06741618:/disobedience/added.c diff --git a/disobedience/added.c b/disobedience/added.c index 8eef894..aa15f48 100644 --- a/disobedience/added.c +++ b/disobedience/added.c @@ -2,22 +2,24 @@ * This file is part of DisOrder * Copyright (C) 2006-2008 Richard Kettlewell * - * This program is free software; you can redistribute it and/or modify + * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * along with this program. If not, see . + */ +/** @file disobedience/added.c + * @brief List of recently added tracks */ #include "disobedience.h" +#include "popup.h" #include "queue-generic.h" /** @brief Called with an updated list of newly-added tracks @@ -27,10 +29,10 @@ * with a valid and unique @c id field. This function fakes it. */ static void added_completed(void attribute((unused)) *v, - const char *error, + const char *err, int nvec, char **vec) { - if(error) { - popup_protocol_error(0, error); + if(err) { + popup_protocol_error(0, err); return; } /* Convert the vector result to a queue linked list */ @@ -64,8 +66,8 @@ static void added_changed(const char attribute((unused)) *event, } /** @brief Called at startup */ -static void added_init(void) { - event_register("added-changed", added_changed, 0); +static void added_init(struct queuelike attribute((unused)) *ql) { + event_register("rescan-complete", added_changed, 0); } /** @brief Columns for the new tracks list */ @@ -77,7 +79,7 @@ static const struct queue_column added_columns[] = { }; /** @brief Pop-up menu for new tracks list */ -static struct queue_menuitem added_menuitems[] = { +static struct menuitem added_menuitems[] = { { "Track properties", ql_properties_activate, ql_properties_sensitive, 0, 0 }, { "Play track", ql_play_activate, ql_play_sensitive, 0, 0 }, { "Select all tracks", ql_selectall_activate, ql_selectall_sensitive, 0, 0 }, @@ -85,11 +87,14 @@ static struct queue_menuitem added_menuitems[] = { }; struct queuelike ql_added = { + .name = "added", .init = added_init, .columns = added_columns, .ncolumns = sizeof added_columns / sizeof *added_columns, .menuitems = added_menuitems, .nmenuitems = sizeof added_menuitems / sizeof *added_menuitems, + .drag_source_targets = choose_targets, + .drag_source_actions = GDK_ACTION_COPY, }; GtkWidget *added_widget(void) {