Abolish last vesiges of struct callbackdata

[disorder] / disobedience / client.c

diff --git a/disobedience/client.c b/disobedience/client.c
index 35c1ce7..a8d33a9 100644 (file)
--- a/disobedience/client.c
+++ b/disobedience/client.c
@@ -1,6 +1,6 @@
 /*
  * 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
@@ -120,7 +120,6 @@ static void gtkclient_poll(void *u,
 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);
 }
 
@@ -130,16 +129,11 @@ static void gtkclient_comms_error(void attribute((unused)) *u,
  * original command and if none is supplied we pop up an error box.
  */
 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
-    popup_protocol_error(code, msg);
+  popup_protocol_error(code, msg);
 }
 
 /** @brief Report callback from eclient */
@@ -148,7 +142,6 @@ 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), "");
-  menu_update(-1);
 }
 
 /** @brief Repoort an unhandled protocol-level error to the user */