chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Loosen playlist command rights.
[disorder]
/
disobedience
/
queue-menu.c
diff --git
a/disobedience/queue-menu.c
b/disobedience/queue-menu.c
index fcc34bf43c239e9fee1a88d53039686a568403b6..5775ee342d7b68704c1c0c7479e08e9f1d59cdb4 100644
(file)
--- a/
disobedience/queue-menu.c
+++ b/
disobedience/queue-menu.c
@@
-81,9
+81,9
@@
int ql_scratch_sensitive(void attribute((unused)) *extra) {
}
static void ql_scratch_completed(void attribute((unused)) *v,
}
static void ql_scratch_completed(void attribute((unused)) *v,
- const char *err
or
) {
- if(err
or
)
- popup_protocol_error(0, err
or
);
+ const char *err) {
+ if(err)
+ popup_protocol_error(0, err);
}
void ql_scratch_activate(GtkMenuItem attribute((unused)) *menuitem,
}
void ql_scratch_activate(GtkMenuItem attribute((unused)) *menuitem,
@@
-116,9
+116,9
@@
int ql_remove_sensitive(void *extra) {
}
static void ql_remove_completed(void attribute((unused)) *v,
}
static void ql_remove_completed(void attribute((unused)) *v,
- const char *err
or
) {
- if(err
or
)
- popup_protocol_error(0, err
or
);
+ const char *err) {
+ if(err)
+ popup_protocol_error(0, err);
}
static void ql_remove_activate_callback(GtkTreeModel *model,
}
static void ql_remove_activate_callback(GtkTreeModel *model,
@@
-127,7
+127,8
@@
static void ql_remove_activate_callback(GtkTreeModel *model,
gpointer attribute((unused)) data) {
struct queue_entry *q = ql_iter_to_q(model, iter);
gpointer attribute((unused)) data) {
struct queue_entry *q = ql_iter_to_q(model, iter);
- disorder_eclient_remove(client, q->id, ql_remove_completed, q);
+ if(q != playing_track)
+ disorder_eclient_remove(client, q->id, ql_remove_completed, q);
}
void ql_remove_activate(GtkMenuItem attribute((unused)) *menuitem,
}
void ql_remove_activate(GtkMenuItem attribute((unused)) *menuitem,
@@
-146,9
+147,9
@@
int ql_play_sensitive(void *extra) {
&& gtk_tree_selection_count_selected_rows(ql->selection) > 0;
}
&& gtk_tree_selection_count_selected_rows(ql->selection) > 0;
}
-static void ql_play_completed(void attribute((unused)) *v, const char *err
or
) {
- if(err
or
)
- popup_protocol_error(0, err
or
);
+static void ql_play_completed(void attribute((unused)) *v, const char *err) {
+ if(err)
+ popup_protocol_error(0, err);
}
static void ql_play_activate_callback(GtkTreeModel *model,
}
static void ql_play_activate_callback(GtkTreeModel *model,
@@
-186,7
+187,7
@@
gboolean ql_button_release(GtkWidget *widget,
}
struct tabtype *ql_tabtype(struct queuelike *ql) {
}
struct tabtype *ql_tabtype(struct queuelike *ql) {
- static const struct tabtype q
l
_tabtype = {
+ static const struct tabtype q
ueuelike
_tabtype = {
ql_properties_sensitive,
ql_selectall_sensitive,
ql_selectnone_sensitive,
ql_properties_sensitive,
ql_selectall_sensitive,
ql_selectnone_sensitive,
@@
-197,7
+198,7
@@
struct tabtype *ql_tabtype(struct queuelike *ql) {
0
};
0
};
- ql->tabtype = q
l
_tabtype;
+ ql->tabtype = q
ueuelike
_tabtype;
ql->tabtype.extra = ql;
return &ql->tabtype;
}
ql->tabtype.extra = ql;
return &ql->tabtype;
}