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 has a 'remote' switch. When off it will
[disorder]
/
disobedience
/
client.c
diff --git
a/disobedience/client.c
b/disobedience/client.c
index 8539221c11dc69440c21479a9d06276848dc34c1..80aef8864365856cdda3293dec33b1254c455f3a 100644
(file)
--- a/
disobedience/client.c
+++ b/
disobedience/client.c
@@
-1,6
+1,6
@@
/*
* This file is part of DisOrder.
/*
* This file is part of DisOrder.
- * Copyright (C) 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2006, 2007
, 2008
Richard Kettlewell
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-119,26
+119,21
@@
static void gtkclient_poll(void *u,
static void gtkclient_comms_error(void attribute((unused)) *u,
const char *msg) {
D(("gtkclient_comms_error %s", msg));
static void gtkclient_comms_error(void attribute((unused)) *u,
const char *msg) {
D(("gtkclient_comms_error %s", msg));
- menu_update(-1);
gtk_label_set_text(GTK_LABEL(report_label), msg);
}
/** @brief Report a protocol-level error
*
* The error will not be retried. We offer a callback to the submitter of the
gtk_label_set_text(GTK_LABEL(report_label), msg);
}
/** @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,
*/
static void gtkclient_protocol_error(void attribute((unused)) *u,
- void *v,
- int code,
+ void
attribute((unused))
*v,
+ int
attribute((unused))
code,
const char *msg) {
const char *msg) {
- struct callbackdata *cbd = v;
-
D(("gtkclient_protocol_error %s", 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 */
}
/** @brief Report callback from eclient */
@@
-147,14
+142,13
@@
static void gtkclient_report(void attribute((unused)) *u,
if(!msg)
/* We're idle - clear the report line */
gtk_label_set_text(GTK_LABEL(report_label), "");
if(!msg)
/* We're idle - clear the report line */
gtk_label_set_text(GTK_LABEL(report_label), "");
- menu_update(-1);
}
/** @brief Repoort an unhandled protocol-level error to the user */
void popup_protocol_error(int attribute((unused)) code,
const char *msg) {
gtk_label_set_text(GTK_LABEL(report_label), msg);
}
/** @brief Repoort an unhandled protocol-level error to the user */
void popup_protocol_error(int attribute((unused)) code,
const char *msg) {
gtk_label_set_text(GTK_LABEL(report_label), msg);
- popup_
error(
msg);
+ popup_
msg(GTK_MESSAGE_ERROR,
msg);
}
/** @brief Table of eclient callbacks */
}
/** @brief Table of eclient callbacks */