<p>This file documents recent user-visible changes to DisOrder.</p>
+<h2>Changes up to version 4.1.1</h2>
+
+<div class=section>
+
+ <p>Disobedience's “Login” window now works when you are logged
+ in.</p>
+
+</div>
+
<h2>Changes up to version 4.1</h2>
<div class=section>
if(revents & (G_IO_OUT|G_IO_HUP|G_IO_ERR))
mode |= DISORDER_POLL_WRITE;
time(&esource->last_poll);
- if(!login_window)
- disorder_eclient_polled(esource->client, mode);
+ disorder_eclient_polled(esource->client, mode);
return TRUE; /* ??? not documented */
}
/** @brief Report a protocol-level error
*
* The error will not be retried. We offer a callback to the submitter of the
- * original command and if none is supplied we pop up an error box.
+ * original command and if none is supplied we drop the error message in the
+ * status bar.
*/
static void gtkclient_protocol_error(void attribute((unused)) *u,
void *v,
const char *msg) {
struct callbackdata *cbd = v;
+ fprintf(stderr, "protocol error: %s\n", msg);
D(("gtkclient_protocol_error %s", msg));
if(cbd && cbd->onerror)
cbd->onerror(cbd, code, msg);
else
- popup_protocol_error(code, msg);
+ gtk_label_set_text(GTK_LABEL(report_label), msg);
}
/** @brief Report callback from eclient */
periodic_fast(0);
/* Recheck server version */
disorder_eclient_version(client, version_completed, 0);
+ disorder_eclient_enable_connect(client);
+ disorder_eclient_enable_connect(logclient);
}
int main(int argc, char **argv) {
} else {
/* Failed to connect - report the error */
popup_msg(GTK_MESSAGE_ERROR, disorder_last(c));
+ /* TODO it would be nice to restore the config (not the entry contents!) to
+ * the last known good one if we were already connected to something. */
}
disorder_close(c); /* no use for this any more */
}
/** @brief Protocol version */
int protocol;
+
+ /** @brief True if enabled */
+ int enabled;
};
/* Forward declarations ******************************************************/
c->callbacks = cb;
c->u = u;
c->opstail = &c->ops;
+ c->enabled = 1;
vector_init(&c->vec);
dynstr_init(&c->input);
dynstr_init(&c->output);
c->log_callbacks->state(c->log_v, c->statebits);
}
+/** @brief Permit new connection activity */
+void disorder_eclient_enable_connect(disorder_eclient *c) {
+ c->enabled = 1;
+}
+
+/** @brief Suppress new connection activity */
+void disorder_eclient_disable_connect(disorder_eclient *c) {
+ c->enabled = 0;
+}
+
/** @brief Return current state */
unsigned long disorder_eclient_state(const disorder_eclient *c) {
return c->statebits | (c->state > state_connected ? DISORDER_CONNECTED : 0);
/* If there is no password yet then we cannot connect */
if(!config->password) {
comms_error(c, "no password is configured");
+ c->enabled = 0;
return;
}
- start_connect(c);
+ /* Only try to connect if enabled */
+ if(c->enabled)
+ start_connect(c);
/* might now be state_disconnected (on error), state_connecting (slow
* connect) or state_connected (fast connect). If state_disconnected then
* we just rely on a periodic callback from the event loop sometime. */
if(c->rc / 100 != 2) {
/* Wrong password or something. We cannot proceed. */
protocol_error(c, op, c->rc, "%s: %s", c->ident, c->line);
+ c->enabled = 0;
disorder_eclient_close(c);
return;
}
const char *password,
const char *rights,
void *v);
-
+void disorder_eclient_enable_connect(disorder_eclient *c);
+void disorder_eclient_disable_connect(disorder_eclient *c);
+
#endif
/*