chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disobedience login window now only remembers password etc if they
[disorder]
/
disobedience
/
control.c
diff --git
a/disobedience/control.c
b/disobedience/control.c
index b62fc06778d448bdbfd782f583d13d3268b0ea24..6ed9fb3564db522c00afc5e0e5f3ceb00df196e3 100644
(file)
--- a/
disobedience/control.c
+++ b/
disobedience/control.c
@@
-128,8
+128,6
@@
struct icon {
GtkWidget *image_off;
};
GtkWidget *image_off;
};
-/* TODO: Add rights into the mix below */
-
static int pause_resume_on(void) {
return !(last_state & DISORDER_TRACK_PAUSED);
}
static int pause_resume_on(void) {
return !(last_state & DISORDER_TRACK_PAUSED);
}
@@
-277,6
+275,7
@@
GtkWidget *control_widget(void) {
char **events = split(icons[n].events, 0, 0, 0, 0);
while(*events)
event_register(*events++, icon_changed, &icons[n]);
char **events = split(icons[n].events, 0, 0, 0, 0);
while(*events)
event_register(*events++, icon_changed, &icons[n]);
+ event_register("connected-changed", icon_changed, &icons[n]);
}
/* create the adjustments for the volume control */
volume_adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, goesupto,
}
/* create the adjustments for the volume control */
volume_adj = GTK_ADJUSTMENT(gtk_adjustment_new(0, 0, goesupto,
@@
-351,15
+350,18
@@
static void volume_changed(const char attribute((unused)) *event,
static void icon_changed(const char attribute((unused)) *event,
void attribute((unused)) *evendata,
void *callbackdata) {
static void icon_changed(const char attribute((unused)) *event,
void attribute((unused)) *evendata,
void *callbackdata) {
+ //fprintf(stderr, "icon_changed (%s)\n", event);
const struct icon *const icon = callbackdata;
int on = icon->on ? icon->on() : 1;
int sensitive = icon->sensitive ? icon->sensitive() : 1;
const struct icon *const icon = callbackdata;
int on = icon->on ? icon->on() : 1;
int sensitive = icon->sensitive ? icon->sensitive() : 1;
+ //fprintf(stderr, "sensitive->%d\n", sensitive);
GtkWidget *child, *newchild;
++suppress_actions;
/* If the connection is down nothing is ever usable */
if(!(last_state & DISORDER_CONNECTED))
sensitive = 0;
GtkWidget *child, *newchild;
++suppress_actions;
/* If the connection is down nothing is ever usable */
if(!(last_state & DISORDER_CONNECTED))
sensitive = 0;
+ //fprintf(stderr, "(checked connected) sensitive->%d\n", sensitive);
/* Replace the child */
newchild = on ? icon->image_on : icon->image_off;
child = gtk_bin_get_child(GTK_BIN(icon->button));
/* Replace the child */
newchild = on ? icon->image_on : icon->image_off;
child = gtk_bin_get_child(GTK_BIN(icon->button));
@@
-371,7
+373,7
@@
static void icon_changed(const char attribute((unused)) *event,
}
/* If you disable play or random play NOT via the icon (for instance, via the
* edit menu or via a completely separate command line invocation) then the
}
/* If you disable play or random play NOT via the icon (for instance, via the
* edit menu or via a completely separate command line invocation) then the
- * icon shows up as insensitive. Hover the mouse over it and the corr
ce
t
+ * icon shows up as insensitive. Hover the mouse over it and the corr
ec
t
* state is immediately displayed. sensitive and GTK_WIDGET_SENSITIVE show
* it to be in the correct state, so I think this is may be a GTK+ bug. */
if(icon->tip_on)
* state is immediately displayed. sensitive and GTK_WIDGET_SENSITIVE show
* it to be in the correct state, so I think this is may be a GTK+ bug. */
if(icon->tip_on)
@@
-388,9
+390,9
@@
static void icon_changed(const char attribute((unused)) *event,
}
static void icon_action_completed(void attribute((unused)) *v,
}
static void icon_action_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 clicked_icon(GtkButton attribute((unused)) *button,
}
static void clicked_icon(GtkButton attribute((unused)) *button,
@@
-417,11
+419,11
@@
static void toggled_menu(GtkCheckMenuItem attribute((unused)) *menuitem,
/** @brief Called when a volume command completes */
static void volume_completed(void attribute((unused)) *v,
/** @brief Called when a volume command completes */
static void volume_completed(void attribute((unused)) *v,
- const char *err
or
,
+ const char *err,
int attribute((unused)) l,
int attribute((unused)) r) {
int attribute((unused)) l,
int attribute((unused)) r) {
- if(err
or
)
- popup_protocol_error(0, err
or
);
+ if(err)
+ popup_protocol_error(0, err);
/* We don't set the UI's notion of the volume here, it is set from the log
* regardless of the reason it changed */
}
/* We don't set the UI's notion of the volume here, it is set from the log
* regardless of the reason it changed */
}