From a66cab1f515ba6ec0d127403c81fe99595df28ff Mon Sep 17 00:00:00 2001
From: Virtually Nick <vnick@apache.org>
Date: Tue, 21 Jun 2022 08:12:07 -0400
Subject: [PATCH] [WIP]: [CLIPBOARD] Fix callback arguments.

---
 src/protocols/spice/channels/clipboard.c | 13 ++++++-------
 src/protocols/spice/channels/clipboard.h | 12 ++++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/protocols/spice/channels/clipboard.c b/src/protocols/spice/channels/clipboard.c
index 9ff751d7..6d8cecf9 100644
--- a/src/protocols/spice/channels/clipboard.c
+++ b/src/protocols/spice/channels/clipboard.c
@@ -85,7 +85,7 @@ int guac_spice_clipboard_end_handler(guac_user* user, guac_stream* stream) {
     return 0;
 }
 
-void guac_spice_clipboard_selection_handler(SpiceMainChannel channel,
+void guac_spice_clipboard_selection_handler(SpiceMainChannel* channel,
         guint selection, guint type, gpointer data, guint size,
         guac_client* client) {
 
@@ -106,8 +106,8 @@ void guac_spice_clipboard_selection_handler(SpiceMainChannel channel,
 
 }
 
-void guac_spice_clipboard_selection_grab_handler(SpiceMainChannel channel,
-        guint selection, guint32* types, guint ntypes, guint extra, guac_client* client) {
+void guac_spice_clipboard_selection_grab_handler(SpiceMainChannel* channel,
+        guint selection, guint32* types, guint ntypes, guac_client* client) {
 
     guac_client_log(client, GUAC_LOG_DEBUG, "Notifying client of clipboard grab"
             " in the guest.");
@@ -115,19 +115,18 @@ void guac_spice_clipboard_selection_grab_handler(SpiceMainChannel channel,
     guac_client_log(client, GUAC_LOG_DEBUG, "Arg: selection: 0x%08x", selection);
     guac_client_log(client, GUAC_LOG_DEBUG, "Arg: types: 0x%08x", types);
     guac_client_log(client, GUAC_LOG_DEBUG, "Arg: ntypes: 0x%08x", ntypes);
-    guac_client_log(client, GUAC_LOG_DEBUG, "Arg: extra: 0x%08x", extra);
 
 }
 
-void guac_spice_clipboard_selection_release_handler(SpiceMainChannel channel,
-        guint selection, guint extra, guac_client* client) {
+void guac_spice_clipboard_selection_release_handler(SpiceMainChannel* channel,
+        guint selection, guac_client* client) {
 
     guac_client_log(client, GUAC_LOG_DEBUG, "Notifying client of clipboard"
             " release in the guest.");
 
 }
 
-void guac_spice_clipboard_selection_request_handler(SpiceMainChannel channel,
+void guac_spice_clipboard_selection_request_handler(SpiceMainChannel* channel,
         guint selection, guint types, guac_client* client) {
 
     guac_client_log(client, GUAC_LOG_DEBUG, "Requesting clipboard data from"
diff --git a/src/protocols/spice/channels/clipboard.h b/src/protocols/spice/channels/clipboard.h
index 397d8a56..68e9d40e 100644
--- a/src/protocols/spice/channels/clipboard.h
+++ b/src/protocols/spice/channels/clipboard.h
@@ -84,7 +84,7 @@ guac_user_end_handler guac_spice_clipboard_end_handler;
  *     The guac_client associated with this event handler, passed when the
  *     handler was registered.
  */
-void guac_spice_clipboard_selection_handler(SpiceMainChannel channel,
+void guac_spice_clipboard_selection_handler(SpiceMainChannel* channel,
         guint selection, guint type, gpointer data, guint size,
         guac_client* client);
 
@@ -108,8 +108,8 @@ void guac_spice_clipboard_selection_handler(SpiceMainChannel channel,
  * @param client
  *     The guac_client that was passed in when the callback was registered.
  */
-void guac_spice_clipboard_selection_grab_handler(SpiceMainChannel channel,
-        guint selection, guint32* types, guint ntypes, guint other, guac_client* client);
+void guac_spice_clipboard_selection_grab_handler(SpiceMainChannel* channel,
+        guint selection, guint32* types, guint ntypes, guac_client* client);
 
 /**
  * A handler that will be called by the SPICE client when the SPICE server
@@ -124,8 +124,8 @@ void guac_spice_clipboard_selection_grab_handler(SpiceMainChannel channel,
  * @param client
  *     The guac_client that was registered with the callback.
  */
-void guac_spice_clipboard_selection_release_handler(SpiceMainChannel channel,
-        guint selection, guint other, guac_client* client);
+void guac_spice_clipboard_selection_release_handler(SpiceMainChannel* channel,
+        guint selection, guac_client* client);
 
 /**
  * A handler that will be called by the SPICE client when the SPICE server
@@ -143,7 +143,7 @@ void guac_spice_clipboard_selection_release_handler(SpiceMainChannel channel,
  * @param client
  *     The guac_client object that was registered with the callback.
  */
-void guac_spice_clipboard_selection_request_handler(SpiceMainChannel channel,
+void guac_spice_clipboard_selection_request_handler(SpiceMainChannel* channel,
         guint selection, guint types, guac_client* client);
 
 #endif /* GUAC_SPICE_CLIPBOARD_H */