Merge login window fix from 4.1 branch

diff --cc disobedience/client.c
index a8d33a92d666e4343a06715f9d9dfdebea8c5de9,5c82953d479ab947586f160ef5664014fddc7fb7..24069034a548f4a98622ad9571137231e7b38990
--- 1/disobedience/client.c
--- 2/disobedience/client.c
+++ b/disobedience/client.c
@@@ -126,14 -125,20 +125,15 @@@ static void gtkclient_comms_error(void 
  /** @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,
 +                                   void attribute((unused)) *v,
                                       int code,
                                     const char *msg) {
 -  struct callbackdata *cbd = v;
 -
    D(("gtkclient_protocol_error %s", msg));
-   popup_protocol_error(code, msg);
 -  if(cbd && cbd->onerror)
 -    cbd->onerror(cbd, code, msg);
 -  else
 -    gtk_label_set_text(GTK_LABEL(report_label), msg);
++  gtk_label_set_text(GTK_LABEL(report_label), msg);
  }
  
  /** @brief Report callback from eclient */

diff --cc disobedience/login.c
Simple merge