~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove action; better findtrack; more template fiddling
[disorder]
/
disobedience
/
client.c
diff --git
a/disobedience/client.c
b/disobedience/client.c
index
8a300c4
..
283ce8a
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 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
@@
-68,7
+68,8
@@
static gboolean gtkclient_dispatch(GSource *source,
if(revents & (G_IO_OUT|G_IO_HUP|G_IO_ERR))
mode |= DISORDER_POLL_WRITE;
time(&esource->last_poll);
if(revents & (G_IO_OUT|G_IO_HUP|G_IO_ERR))
mode |= DISORDER_POLL_WRITE;
time(&esource->last_poll);
- disorder_eclient_polled(esource->client, mode);
+ if(!login_window)
+ disorder_eclient_polled(esource->client, mode);
return TRUE; /* ??? not documented */
}
return TRUE; /* ??? not documented */
}
@@
-154,7
+155,7
@@
static void gtkclient_report(void attribute((unused)) *u,
void popup_protocol_error(int attribute((unused)) code,
const char *msg) {
gtk_label_set_text(GTK_LABEL(report_label), msg);
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 */
@@
-165,7
+166,7
@@
static const disorder_eclient_callbacks gtkclient_callbacks = {
gtkclient_report
};
gtkclient_report
};
-/** @brief Create a @ref disorder_ecli
i
ent using the GLib main loop */
+/** @brief Create a @ref disorder_eclient using the GLib main loop */
disorder_eclient *gtkclient(void) {
GSource *source;
struct eclient_source *esource;
disorder_eclient *gtkclient(void) {
GSource *source;
struct eclient_source *esource;