X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/e9b70a84ae0e40ea4bcaa6e557f2f67eea57cfd3..9aa6b167410b3b0545e93ba9cdc2bf0a0785c00b:/disobedience/queue.c

diff --git a/disobedience/queue.c b/disobedience/queue.c
index f9b9ec8..9423252 100644
--- a/disobedience/queue.c
+++ b/disobedience/queue.c
@@ -849,7 +849,7 @@ static void remove_drag_targets(struct queuelike *ql) {
 static void redisplay_queue(struct queuelike *ql) {
   struct queue_entry *q;
   int row, col;
-  GList *c;
+  GList *c, *children;
   const char *name;
   GtkRequisition req;  
   GtkWidget *w;
@@ -858,7 +858,7 @@ static void redisplay_queue(struct queuelike *ql) {
 
   D(("redisplay_queue"));
   /* Eliminate all the existing widgets and start from scratch */
-  for(c = gtk_container_get_children(GTK_CONTAINER(ql->mainlayout));
+  for(c = children = gtk_container_get_children(GTK_CONTAINER(ql->mainlayout));
       c;
       c = c->next) {
     /* Destroy both the label and the eventbox */
@@ -869,6 +869,7 @@ static void redisplay_queue(struct queuelike *ql) {
     DW(event_box);
     gtk_widget_destroy(GTK_WIDGET(c->data));
   }
+  g_list_free(children);
   /* Adjust the row count */
   for(q = ql->q, ql->nrows = 0; q; q = q->next)
     ++ql->nrows;
@@ -1183,10 +1184,10 @@ static gboolean adjust_sofar(gpointer attribute((unused)) data) {
 /* Popup menu for the queue.  Put the properties first so that finger trouble
  * is less dangerous. */
 static struct menuitem queue_menu[] = {
-  { "Properties", properties_activate, properties_sensitive, 0, 0 },
-  { "Select all", selectall_activate, selectall_sensitive, 0, 0 },
-  { "Scratch", scratch_activate, scratch_sensitive, 0, 0 },
-  { "Remove", remove_activate, remove_sensitive, 0, 0 },
+  { "Track properties", properties_activate, properties_sensitive, 0, 0 },
+  { "Select all tracks", selectall_activate, selectall_sensitive, 0, 0 },
+  { "Scratch track", scratch_activate, scratch_sensitive, 0, 0 },
+  { "Remove track from queue", remove_activate, remove_sensitive, 0, 0 },
   { 0, 0, 0, 0, 0 }
 };
 
@@ -1238,8 +1239,8 @@ static struct queue_entry *fixup_recent(struct queue_entry *q) {
 }
 
 static struct menuitem recent_menu[] = {
-  { "Properties", properties_activate, properties_sensitive,0, 0 },
-  { "Select all", selectall_activate, selectall_sensitive, 0, 0 },
+  { "Track properties", properties_activate, properties_sensitive,0, 0 },
+  { "Select all tracks", selectall_activate, selectall_sensitive, 0, 0 },
   { 0, 0, 0, 0, 0 }
 };