Merge login window fix from 4.1 branch

[disorder] / disobedience / client.c

diff --git a/disobedience/client.c b/disobedience/client.c
index 5c82953d479ab947586f160ef5664014fddc7fb7..24069034a548f4a98622ad9571137231e7b38990 100644 (file)
--- a/disobedience/client.c
+++ b/disobedience/client.c
@@ -129,16 +129,11 @@ static void gtkclient_comms_error(void attribute((unused)) *u,
  * 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));
-  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 */