Merge login window fix from 4.1 branch

[disorder] / disobedience / client.c

diff --git a/disobedience/client.c b/disobedience/client.c
index a8d33a92d666e4343a06715f9d9dfdebea8c5de9..24069034a548f4a98622ad9571137231e7b38990 100644 (file)
--- a/disobedience/client.c
+++ b/disobedience/client.c
@@ -68,8 +68,7 @@ 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(!login_window)
-    disorder_eclient_polled(esource->client, mode);
+  disorder_eclient_polled(esource->client, mode);
   return TRUE;                          /* ??? not documented */
 }
 
@@ -126,14 +125,15 @@ static void gtkclient_comms_error(void attribute((unused)) *u,
 /** @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 attribute((unused)) *v,
                                      int code,
                                     const char *msg) {
   D(("gtkclient_protocol_error %s", msg));
-  popup_protocol_error(code, msg);
+  gtk_label_set_text(GTK_LABEL(report_label), msg);
 }
 
 /** @brief Report callback from eclient */