[Spice-devel] [PATCH spice-gtk 1/4] Drop VOID:BOXED user marshaller

[Hans de Goede]

We were generating a user marshaller for VOID:BOXED, but there is a standard
marshaller for that, use that instead.

Signed-off-by: Hans de Goede <hdegoede at redhat.com>
---
 gtk/smartcard-manager.c  |    8 ++++----
 gtk/spice-marshal.txt    |    1 -
 gtk/usb-device-manager.c |    4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/gtk/smartcard-manager.c b/gtk/smartcard-manager.c
index a192bd6..c4afae2 100644
--- a/gtk/smartcard-manager.c
+++ b/gtk/smartcard-manager.c
@@ -157,7 +157,7 @@ static void spice_smartcard_manager_class_init(SpiceSmartcardManagerClass *klass
                      G_SIGNAL_RUN_FIRST,
                      G_STRUCT_OFFSET(SpiceSmartcardManagerClass, reader_added),
                      NULL, NULL,
-                     g_cclosure_user_marshal_VOID__BOXED,
+                     g_cclosure_marshal_VOID__BOXED,
                      G_TYPE_NONE,
                      1,
                      SPICE_TYPE_SMARTCARD_READER);
@@ -176,7 +176,7 @@ static void spice_smartcard_manager_class_init(SpiceSmartcardManagerClass *klass
                      G_SIGNAL_RUN_FIRST,
                      G_STRUCT_OFFSET(SpiceSmartcardManagerClass, reader_removed),
                      NULL, NULL,
-                     g_cclosure_user_marshal_VOID__BOXED,
+                     g_cclosure_marshal_VOID__BOXED,
                      G_TYPE_NONE,
                      1,
                      SPICE_TYPE_SMARTCARD_READER);
@@ -196,7 +196,7 @@ static void spice_smartcard_manager_class_init(SpiceSmartcardManagerClass *klass
                      G_SIGNAL_RUN_FIRST,
                      G_STRUCT_OFFSET(SpiceSmartcardManagerClass, card_inserted),
                      NULL, NULL,
-                     g_cclosure_user_marshal_VOID__BOXED,
+                     g_cclosure_marshal_VOID__BOXED,
                      G_TYPE_NONE,
                      1,
                      SPICE_TYPE_SMARTCARD_READER);
@@ -216,7 +216,7 @@ static void spice_smartcard_manager_class_init(SpiceSmartcardManagerClass *klass
                      G_SIGNAL_RUN_FIRST,
                      G_STRUCT_OFFSET(SpiceSmartcardManagerClass, card_removed),
                      NULL, NULL,
-                     g_cclosure_user_marshal_VOID__BOXED,
+                     g_cclosure_marshal_VOID__BOXED,
                      G_TYPE_NONE,
                      1,
                      SPICE_TYPE_SMARTCARD_READER);
diff --git a/gtk/spice-marshal.txt b/gtk/spice-marshal.txt
index b9630eb..55467e1 100644
--- a/gtk/spice-marshal.txt
+++ b/gtk/spice-marshal.txt
@@ -6,7 +6,6 @@ VOID:INT,INT,INT,INT,INT,POINTER
 VOID:POINTER,INT
 BOOLEAN:POINTER,UINT
 BOOLEAN:UINT
-VOID:BOXED
 VOID:UINT,POINTER,UINT
 VOID:UINT,UINT,POINTER,UINT
 BOOLEAN:UINT,POINTER,UINT
diff --git a/gtk/usb-device-manager.c b/gtk/usb-device-manager.c
index 0e2a9ed..7557ed8 100644
--- a/gtk/usb-device-manager.c
+++ b/gtk/usb-device-manager.c
@@ -256,7 +256,7 @@ static void spice_usb_device_manager_class_init(SpiceUsbDeviceManagerClass *klas
                      G_SIGNAL_RUN_FIRST,
                      G_STRUCT_OFFSET(SpiceUsbDeviceManagerClass, device_added),
                      NULL, NULL,
-                     g_cclosure_user_marshal_VOID__BOXED,
+                     g_cclosure_marshal_VOID__BOXED,
                      G_TYPE_NONE,
                      1,
                      SPICE_TYPE_USB_DEVICE);
@@ -275,7 +275,7 @@ static void spice_usb_device_manager_class_init(SpiceUsbDeviceManagerClass *klas
                      G_SIGNAL_RUN_FIRST,
                      G_STRUCT_OFFSET(SpiceUsbDeviceManagerClass, device_removed),
                      NULL, NULL,
-                     g_cclosure_user_marshal_VOID__BOXED,
+                     g_cclosure_marshal_VOID__BOXED,
                      G_TYPE_NONE,
                      1,
                      SPICE_TYPE_USB_DEVICE);
-- 
1.7.6.1