_eclient_state is more general than _eclient_connected

[disorder] / disobedience / queue.c

diff --git a/disobedience/queue.c b/disobedience/queue.c
index e4c38629f5b2dbab445a4aefaf282f69be61934e..6ef558db87f8212e96411def14d1a279b6905b12 100644 (file)
--- a/disobedience/queue.c
+++ b/disobedience/queue.c
@@ -1097,7 +1097,7 @@ static int scratch_sensitive(struct queuelike attribute((unused)) *ql,
                              struct queue_entry attribute((unused)) *q) {
   /* We can scratch if the playing track is selected */
   return (playing_track
                              struct queue_entry attribute((unused)) *q) {
   /* We can scratch if the playing track is selected */
   return (playing_track

-          && disorder_eclient_connected(client)
+          && (disorder_eclient_state(client) & DISORDER_CONNECTED)

           && selection_selected(ql->selection, playing_track->id));
 }
 
           && selection_selected(ql->selection, playing_track->id));
 }
 


@@ -1112,7 +1112,7 @@ static int remove_sensitive(struct queuelike *ql,
                             struct queue_entry *q) {
   /* We can remove if we're hovering over a particular track or any non-playing
    * tracks are selected */
                             struct queue_entry *q) {
   /* We can remove if we're hovering over a particular track or any non-playing
    * tracks are selected */

-  return (disorder_eclient_connected(client)
+  return ((disorder_eclient_state(client) & DISORDER_CONNECTED)

           && ((q
                && q != playing_track)
               || count_selected_nonplaying(ql)));
           && ((q
                && q != playing_track)
               || count_selected_nonplaying(ql)));


@@ -1139,7 +1139,7 @@ static int properties_sensitive(struct queuelike *ql,
                                 struct queue_entry attribute((unused)) *q) {
   /* "Properties" is sensitive if at least something is selected */
   return (hash_count(ql->selection) > 0
                                 struct queue_entry attribute((unused)) *q) {
   /* "Properties" is sensitive if at least something is selected */
   return (hash_count(ql->selection) > 0

-          && disorder_eclient_connected(client));
+          && (disorder_eclient_state(client) & DISORDER_CONNECTED));

 }
 
 static void properties_activate(GtkMenuItem attribute((unused)) *menuitem,
 }
 
 static void properties_activate(GtkMenuItem attribute((unused)) *menuitem,


@@ -1269,7 +1269,8 @@ void recent_update(void) {
 /* Main menu plumbing ------------------------------------------------------ */
 
 static int queue_properties_sensitive(GtkWidget *w) {
 /* Main menu plumbing ------------------------------------------------------ */
 
 static int queue_properties_sensitive(GtkWidget *w) {

-  return !!queue_count_selected(g_object_get_data(G_OBJECT(w), "queue"));
+  return (!!queue_count_selected(g_object_get_data(G_OBJECT(w), "queue"))
+          && (disorder_eclient_state(client) & DISORDER_CONNECTED));

 }
 
 static int queue_selectall_sensitive(GtkWidget *w) {
 }
 
 static int queue_selectall_sensitive(GtkWidget *w) {