From d7b0c5085ee3d26298ba58692ab17c11cdf1e826 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Sun, 20 Nov 2011 23:14:20 -0800
Subject: [PATCH] Revert changes to client.h (mockup of guac_status refactor)

---
 libguac/include/client.h | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/libguac/include/client.h b/libguac/include/client.h
index 3483ce01..38565f4c 100644
--- a/libguac/include/client.h
+++ b/libguac/include/client.h
@@ -41,7 +41,6 @@
 
 #include "guacio.h"
 #include "protocol.h"
-#include "error.h"
 
 /**
  * Provides functions and structures required for defining (and handling) a proxy client.
@@ -81,28 +80,28 @@ typedef struct guac_client guac_client;
  * Handler for server messages (where "server" refers to the server that
  * the proxy client is connected to).
  */
-typedef guac_status guac_client_handle_messages(guac_client* client);
+typedef int guac_client_handle_messages(guac_client* client);
 
 /**
  * Handler for Guacamole mouse events.
  */
-typedef guac_status guac_client_mouse_handler(guac_client* client, int x, int y, int button_mask);
+typedef int guac_client_mouse_handler(guac_client* client, int x, int y, int button_mask);
 
 /**
  * Handler for Guacamole key events.
  */
-typedef guac_status guac_client_key_handler(guac_client* client, int keysym, int pressed);
+typedef int guac_client_key_handler(guac_client* client, int keysym, int pressed);
 
 /**
  * Handler for Guacamole clipboard events.
  */
-typedef guac_status guac_client_clipboard_handler(guac_client* client, char* copied);
+typedef int guac_client_clipboard_handler(guac_client* client, char* copied);
 
 /**
  * Handler for freeing up any extra data allocated by the client
  * implementation.
  */
-typedef guac_status guac_client_free_handler(guac_client* client);
+typedef int guac_client_free_handler(guac_client* client);
 
 /**
  * Possible current states of the Guacamole client. Currently, the only
@@ -296,7 +295,7 @@ struct guac_client {
 /**
  * Handler which should initialize the given guac_client.
  */
-typedef guac_status guac_client_init_handler(guac_client* client, int argc, char** argv);
+typedef int guac_client_init_handler(guac_client* client, int argc, char** argv);
 
 /**
  * Initialize and return a new guac_client. The pluggable client will be chosen based on
@@ -316,14 +315,14 @@ guac_client* guac_get_client(int client_fd);
  *         occurs during startup. Note that this function will still return
  *         zero if an error occurs while the client is running.
  */
-guac_status guac_start_client(guac_client* client);
+int guac_start_client(guac_client* client);
 
 /**
  * Free all resources associated with the given client.
  *
  * @param client The proxy client to free all reasources of.
  */
-guac_status guac_free_client(guac_client* client);
+void guac_free_client(guac_client* client);
 
 /**
  * Call the appropriate handler defined by the given client for the given
@@ -335,7 +334,7 @@ guac_status guac_free_client(guac_client* client);
  * @param instruction The instruction to pass to the proxy client via the
  *                    appropriate handler.
  */
-guac_status guac_client_handle_instruction(guac_client* client, guac_instruction* instruction);
+int guac_client_handle_instruction(guac_client* client, guac_instruction* instruction);
 
 /**
  * Signal the given client to stop. This will set the state of the given client
@@ -344,7 +343,7 @@ guac_status guac_client_handle_instruction(guac_client* client, guac_instruction
  *
  * @param client The proxy client to stop.
  */
-guac_status guac_client_stop(guac_client* client);
+void guac_client_stop(guac_client* client);
 
 /**
  * Allocates a new buffer (invisible layer). An arbitrary index is
@@ -372,7 +371,7 @@ guac_layer* guac_client_alloc_layer(guac_client* client, int index);
  * @param client The proxy client to return the buffer to.
  * @param layer The buffer to return to the pool of available buffers.
  */
-guac_status guac_client_free_buffer(guac_client* client, guac_layer* layer);
+void guac_client_free_buffer(guac_client* client, guac_layer* layer);
 
 /**
  * The default Guacamole client layer, layer 0.