Stop generating glib marshals by using glib >= 2.30

diff --git a/configure.ac b/configure.ac
index a9b56328682fb997e270fd4d672593ebe5a90cf7..bcca8d608e87ecc8ba2378432f0069a6a0405aa2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ AC_CHECK_HEADERS(security/pam_appl.h, [], AC_MSG_ERROR(PAM not found))
 AC_CHECK_FUNCS(setresgid setresuid clearenv)
 
 PKG_CHECK_MODULES(LIGHTDM, [
-    glib-2.0 >= 2.24
+    glib-2.0 >= 2.30
     gio-2.0 >= 2.26
     gio-unix-2.0
     xdmcp
@@ -132,8 +132,6 @@ AC_ARG_ENABLE(tests,
         [], [enable_tests="yes"])
 AM_CONDITIONAL(COMPILE_TESTS, test x"$enable_tests" != "xno")
 
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
-
 dnl ###########################################################################
 dnl Configurable values
 dnl ###########################################################################

diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
index 8f90308fe4ceb24710c7e265036f021933ce2834..9387118ca1c9889aa9d2a716a0a313112908f8a9 100644 (file)
--- a/liblightdm-gobject/greeter.c
+++ b/liblightdm-gobject/greeter.c
@@ -1183,42 +1183,6 @@ lightdm_greeter_get_property (GObject    *object,
     }
 }
 
-static void
-marshal_VOID__STRING_INT (GClosure     *closure,
-                          GValue       *return_value G_GNUC_UNUSED,
-                          guint         n_param_values,
-                          const GValue *param_values,
-                          gpointer      invocation_hint G_GNUC_UNUSED,
-                          gpointer      marshal_data)
-{
-    typedef void (*GMarshalFunc_VOID__STRING_INT) (gpointer     data1,
-                                                   gpointer     arg_1,
-                                                   gint         arg_2,
-                                                   gpointer     data2);
-    register GMarshalFunc_VOID__STRING_INT callback;
-    register GCClosure *cc = (GCClosure*) closure;
-    register gpointer data1, data2;
-
-    g_return_if_fail (n_param_values == 3);
-
-    if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-        data1 = closure->data;
-        data2 = g_value_peek_pointer (param_values + 0);
-    }
-    else
-    {
-        data1 = g_value_peek_pointer (param_values + 0);
-        data2 = closure->data;
-    }
-    callback = (GMarshalFunc_VOID__STRING_INT) (marshal_data ? marshal_data : cc->callback);
-
-    callback (data1,
-              (param_values + 1)->data[0].v_pointer,
-              (param_values + 2)->data[0].v_int,
-              data2);
-}
-
 static void
 lightdm_greeter_finalize (GObject *object)
 {
@@ -1375,7 +1339,7 @@ lightdm_greeter_class_init (LightDMGreeterClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (LightDMGreeterClass, show_prompt),
                       NULL, NULL,
-                      marshal_VOID__STRING_INT,
+                      NULL,
                       G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT);
 
     /**
@@ -1393,7 +1357,7 @@ lightdm_greeter_class_init (LightDMGreeterClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (LightDMGreeterClass, show_message),
                       NULL, NULL,
-                      marshal_VOID__STRING_INT,
+                      NULL,
                       G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT);
 
     /**
@@ -1412,7 +1376,7 @@ lightdm_greeter_class_init (LightDMGreeterClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (LightDMGreeterClass, authentication_complete),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
 
     /**
@@ -1428,6 +1392,6 @@ lightdm_greeter_class_init (LightDMGreeterClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (LightDMGreeterClass, autologin_timer_expired),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
 }

diff --git a/liblightdm-gobject/user.c b/liblightdm-gobject/user.c
index 37e73f9801e5d8784535d1a2c22ca0ee3df426cd..d8bd2e083a3074f5b504f3abf5c21962fbba5230 100644 (file)
--- a/liblightdm-gobject/user.c
+++ b/liblightdm-gobject/user.c
@@ -979,7 +979,7 @@ lightdm_user_list_class_init (LightDMUserListClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (LightDMUserListClass, user_added),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
+                      NULL,
                       G_TYPE_NONE, 1, LIGHTDM_TYPE_USER);
 
     /**
@@ -995,7 +995,7 @@ lightdm_user_list_class_init (LightDMUserListClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (LightDMUserListClass, user_changed),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
+                      NULL,
                       G_TYPE_NONE, 1, LIGHTDM_TYPE_USER);
 
     /**
@@ -1011,7 +1011,7 @@ lightdm_user_list_class_init (LightDMUserListClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (LightDMUserListClass, user_removed),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
+                      NULL,
                       G_TYPE_NONE, 1, LIGHTDM_TYPE_USER);
 }
 
@@ -1614,7 +1614,7 @@ lightdm_user_class_init (LightDMUserClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (LightDMUserClass, changed),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
 }
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 415e5cc8e3ee5ca2708b1bf207469f4f14615003..9138e6a7a150c1748e4e114b4dfce51338f75825 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,5 @@
 sbin_PROGRAMS = lightdm
 
-ldm-marshal.c: ldm-marshal.list
-       @GLIB_GENMARSHAL@ --prefix=ldm_marshal $(srcdir)/ldm-marshal.list --header --body > ldm-marshal.c
-
-ldm-marshal.h: ldm-marshal.list
-       @GLIB_GENMARSHAL@ --prefix=ldm_marshal $(srcdir)/ldm-marshal.list --header > ldm-marshal.h
-
 lightdm_SOURCES = \
        accounts.c \
        accounts.h \
@@ -26,8 +20,6 @@ lightdm_SOURCES = \
        guest-account.c \
        guest-account.h \
        lightdm.c \
-       ldm-marshal.c \
-       ldm-marshal.h \
        login1.c \
        login1.h \
        plymouth.c \
@@ -76,10 +68,6 @@ lightdm_SOURCES = \
        xsession.c \
        xsession.h
 
-BUILT_SOURCES = \
-       ldm-marshal.c \
-       ldm-marshal.h
-
 lightdm_CFLAGS = \
        $(LIGHTDM_CFLAGS) \
        $(WARN_CFLAGS) \
@@ -106,11 +94,8 @@ lightdm_guest_session_wrapper_CFLAGS = \
        $(LIGHTDM_CFLAGS) \
        $(WARN_CFLAGS)
 
-EXTRA_DIST = ldm-marshal.list \
+EXTRA_DIST = \
        display-manager.xml
 
-CLEANFILES = \
-       $(BUILT_SOURCES)
-
 DISTCLEANFILES = \
        Makefile.in

diff --git a/src/display-manager.c b/src/display-manager.c
index 465023e3b99bd44a9dae8887676c5ef095c9df4e..c9a84bdacdb17ce7329b2cbcfd4a84e062a8aff5 100644 (file)
--- a/src/display-manager.c
+++ b/src/display-manager.c
@@ -185,7 +185,7 @@ display_manager_class_init (DisplayManagerClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (DisplayManagerClass, seat_added),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
+                      NULL,
                       G_TYPE_NONE, 1, SEAT_TYPE);
     signals[SEAT_REMOVED] =
         g_signal_new ("seat-removed",
@@ -193,7 +193,7 @@ display_manager_class_init (DisplayManagerClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (DisplayManagerClass, seat_removed),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
+                      NULL,
                       G_TYPE_NONE, 1, SEAT_TYPE);
     signals[STOPPED] =
         g_signal_new ("stopped",
@@ -201,6 +201,6 @@ display_manager_class_init (DisplayManagerClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (DisplayManagerClass, stopped),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
 }

diff --git a/src/display-server.c b/src/display-server.c
index 2c40c051759ef510d9af59a48b540324a052e2a4..03cfccbc4edc74886118f2680ae94097075c1b36 100644 (file)
--- a/src/display-server.c
+++ b/src/display-server.c
@@ -133,7 +133,7 @@ display_server_class_init (DisplayServerClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (DisplayServerClass, ready),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
     signals[STOPPED] =
         g_signal_new ("stopped",
@@ -141,6 +141,6 @@ display_server_class_init (DisplayServerClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (DisplayServerClass, stopped),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
 }

diff --git a/src/display.c b/src/display.c
index 5820c9531a275a7aa814b1cbc89cf48c791f8939..b969be02fe3e3b253437d50711886a4379daa8a5 100644 (file)
--- a/src/display.c
+++ b/src/display.c
@@ -17,7 +17,6 @@
 
 #include "display.h"
 #include "configuration.h"
-#include "ldm-marshal.h"
 #include "greeter.h"
 
 enum
@@ -1068,7 +1067,7 @@ display_class_init (DisplayClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (DisplayClass, create_session),
                       NULL, NULL,
-                      ldm_marshal_OBJECT__VOID,
+                      NULL,
                       SESSION_TYPE, 0);
     signals[READY] =
         g_signal_new ("ready",
@@ -1076,7 +1075,7 @@ display_class_init (DisplayClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (DisplayClass, ready),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
     signals[SWITCH_TO_USER] =
         g_signal_new ("switch-to-user",
@@ -1085,7 +1084,7 @@ display_class_init (DisplayClass *klass)
                       G_STRUCT_OFFSET (DisplayClass, switch_to_user),
                       g_signal_accumulator_true_handled,
                       NULL,
-                      ldm_marshal_BOOLEAN__OBJECT,
+                      NULL,
                       G_TYPE_BOOLEAN, 1, USER_TYPE);
     signals[SWITCH_TO_GUEST] =
         g_signal_new ("switch-to-guest",
@@ -1094,7 +1093,7 @@ display_class_init (DisplayClass *klass)
                       G_STRUCT_OFFSET (DisplayClass, switch_to_guest),
                       g_signal_accumulator_true_handled,
                       NULL,
-                      ldm_marshal_BOOLEAN__VOID,
+                      NULL,
                       G_TYPE_BOOLEAN, 0);
     signals[GET_GUEST_USERNAME] =
         g_signal_new ("get-guest-username",
@@ -1103,7 +1102,7 @@ display_class_init (DisplayClass *klass)
                       G_STRUCT_OFFSET (DisplayClass, get_guest_username),
                       g_signal_accumulator_first_wins,
                       NULL,
-                      ldm_marshal_STRING__VOID,
+                      NULL,
                       G_TYPE_STRING, 0);
     signals[DISPLAY_SERVER_READY] =
         g_signal_new ("display-server-ready",
@@ -1111,7 +1110,7 @@ display_class_init (DisplayClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (DisplayClass, display_server_ready),
                       NULL, NULL,
-                      ldm_marshal_BOOLEAN__VOID,
+                      NULL,
                       G_TYPE_BOOLEAN, 0);
     signals[START_GREETER] =
         g_signal_new ("start-greeter",
@@ -1119,7 +1118,7 @@ display_class_init (DisplayClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (DisplayClass, start_greeter),
                       g_signal_accumulator_true_handled, NULL,
-                      ldm_marshal_BOOLEAN__VOID,
+                      NULL,
                       G_TYPE_BOOLEAN, 0);
     signals[START_SESSION] =
         g_signal_new ("start-session",
@@ -1127,7 +1126,7 @@ display_class_init (DisplayClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (DisplayClass, start_session),
                       g_signal_accumulator_true_handled, NULL,
-                      ldm_marshal_BOOLEAN__VOID,
+                      NULL,
                       G_TYPE_BOOLEAN, 0);
     signals[CREATE_DISPLAY] =
         g_signal_new ("create-display",
@@ -1135,7 +1134,7 @@ display_class_init (DisplayClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (DisplayClass, create_display),
                       NULL, NULL,
-                      ldm_marshal_OBJECT__OBJECT,
+                      NULL,
                       DISPLAY_TYPE, 1, SESSION_TYPE);
     signals[STOPPED] =
         g_signal_new ("stopped",
@@ -1143,6 +1142,6 @@ display_class_init (DisplayClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (DisplayClass, stopped),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
 }

diff --git a/src/greeter.c b/src/greeter.c
index 60cf8cb219856c76bc65e237c5da237b36649a51..a97edb0239dd192f30e90ec536230f990f3758a1 100644 (file)
--- a/src/greeter.c
+++ b/src/greeter.c
@@ -18,7 +18,6 @@
 #include <gcrypt.h>
 
 #include "greeter.h"
-#include "ldm-marshal.h"
 #include "configuration.h"
 
 enum {
@@ -920,7 +919,7 @@ greeter_class_init (GreeterClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (GreeterClass, connected),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
 
     signals[START_AUTHENTICATION] =
@@ -930,7 +929,7 @@ greeter_class_init (GreeterClass *klass)
                       G_STRUCT_OFFSET (GreeterClass, start_authentication),
                       g_signal_accumulator_first_wins,
                       NULL,
-                      ldm_marshal_OBJECT__STRING,
+                      NULL,
                       SESSION_TYPE, 1, G_TYPE_STRING);
 
     signals[START_SESSION] =
@@ -940,7 +939,7 @@ greeter_class_init (GreeterClass *klass)
                       G_STRUCT_OFFSET (GreeterClass, start_session),
                       g_signal_accumulator_true_handled,
                       NULL,
-                      ldm_marshal_BOOLEAN__INT_STRING,
+                      NULL,
                       G_TYPE_BOOLEAN, 2, G_TYPE_INT, G_TYPE_STRING);
 
     g_type_class_add_private (klass, sizeof (GreeterPrivate));

diff --git a/src/ldm-marshal.list b/src/ldm-marshal.list
deleted file mode 100644 (file)
index 4edb961..0000000
--- a/src/ldm-marshal.list
+++ /dev/null
@@ -1,8 +0,0 @@
-VOID:INT,POINTER
-BOOLEAN:VOID
-BOOLEAN:INT,STRING
-BOOLEAN:OBJECT
-STRING:VOID
-OBJECT:VOID
-OBJECT:STRING
-OBJECT:OBJECT

diff --git a/src/process.c b/src/process.c
index c3ec0f31a2306b92b6cd9e546dcac582f8de1576..819d879ae727aa09e097268d47ae7e3d157e7b21 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -358,7 +358,7 @@ process_class_init (ProcessClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (ProcessClass, run),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0); 
     signals[GOT_DATA] =
         g_signal_new ("got-data",
@@ -366,7 +366,7 @@ process_class_init (ProcessClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (ProcessClass, got_data),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0); 
     signals[GOT_SIGNAL] =
         g_signal_new ("got-signal",
@@ -374,7 +374,7 @@ process_class_init (ProcessClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (ProcessClass, got_signal),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__INT,
+                      NULL,
                       G_TYPE_NONE, 1, G_TYPE_INT);
     signals[STOPPED] =
         g_signal_new ("stopped",
@@ -382,7 +382,7 @@ process_class_init (ProcessClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (ProcessClass, stopped),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
 
     /* Catch signals and feed them to the main loop via a pipe */

diff --git a/src/seat.c b/src/seat.c
index 77dbec6e2d87560660060687d1c47c724eac61f5..bb8f9614904cfb0e9a072e0d31830691036de423 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -853,7 +853,7 @@ seat_class_init (SeatClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (SeatClass, display_added),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
+                      NULL,
                       G_TYPE_NONE, 1, DISPLAY_TYPE);
     signals[DISPLAY_REMOVED] =
         g_signal_new ("display-removed",
@@ -861,7 +861,7 @@ seat_class_init (SeatClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (SeatClass, display_removed),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
+                      NULL,
                       G_TYPE_NONE, 1, DISPLAY_TYPE);
     signals[STOPPED] =
         g_signal_new ("stopped",
@@ -869,6 +869,6 @@ seat_class_init (SeatClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (SeatClass, stopped),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
 }

diff --git a/src/session.c b/src/session.c
index 839769bb52c1b112df482c99eaa8ac300228a4eb..a8adc89427f1c848a1409cff0c5a59823ca51098 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -705,7 +705,7 @@ session_class_init (SessionClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (SessionClass, got_messages),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
 
     signals[AUTHENTICATION_COMPLETE] =
@@ -714,7 +714,7 @@ session_class_init (SessionClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (SessionClass, authentication_complete),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
 
     signals[STOPPED] =
@@ -723,6 +723,6 @@ session_class_init (SessionClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (SessionClass, stopped),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
 }

diff --git a/src/vnc-server.c b/src/vnc-server.c
index a6402a436c19bb0966d843b26976f5d2042fc284..b265e287372f78be40dbc95fdca287ed70fd8005 100644 (file)
--- a/src/vnc-server.c
+++ b/src/vnc-server.c
@@ -173,6 +173,6 @@ vnc_server_class_init (VNCServerClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (VNCServerClass, new_connection),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
+                      NULL,
                       G_TYPE_NONE, 1, G_TYPE_SOCKET);
 }

diff --git a/src/xdmcp-server.c b/src/xdmcp-server.c
index b92df9c97478a1359c5094880e16fcabc510207a..ebaee172efc66c3cc2b5e71e6830072e400abf1e 100644 (file)
--- a/src/xdmcp-server.c
+++ b/src/xdmcp-server.c
@@ -15,7 +15,6 @@
 #define HASXDMAUTH
 #include <X11/Xdmcp.h>
 #include <gio/gio.h>
-#include "ldm-marshal.h"
 
 #include "xdmcp-server.h"
 #include "xdmcp-protocol.h"
@@ -707,6 +706,6 @@ xdmcp_server_class_init (XDMCPServerClass *klass)
                       G_STRUCT_OFFSET (XDMCPServerClass, new_session),
                       g_signal_accumulator_true_handled,
                       NULL,
-                      ldm_marshal_BOOLEAN__OBJECT,
+                      NULL,
                       G_TYPE_BOOLEAN, 1, XDMCP_SESSION_TYPE);
 }

diff --git a/tests/src/x-server.c b/tests/src/x-server.c
index 240035816035e6abd85834fb0715aefeaea2619b..d3d1f3de228f01dc6669f65b308b108281f7792c 100644 (file)
--- a/tests/src/x-server.c
+++ b/tests/src/x-server.c
@@ -91,7 +91,7 @@ x_client_class_init (XClientClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (XClientClass, disconnected),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
 }
 
@@ -196,7 +196,7 @@ x_server_class_init (XServerClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (XServerClass, client_connected),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
+                      NULL,
                       G_TYPE_NONE, 1, x_client_get_type ());
     x_server_signals[X_SERVER_CLIENT_DISCONNECTED] =
         g_signal_new ("client-disconnected",
@@ -204,6 +204,6 @@ x_server_class_init (XServerClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (XServerClass, client_disconnected),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__OBJECT,
+                      NULL,
                       G_TYPE_NONE, 1, x_client_get_type ());
 }

diff --git a/tests/src/xdmcp-client.c b/tests/src/xdmcp-client.c
index c1a1ffec1b210d904c4da49174cce6bde849f56a..4308da871eacb397d071dd282309d6a736a82e72 100644 (file)
--- a/tests/src/xdmcp-client.c
+++ b/tests/src/xdmcp-client.c
@@ -443,7 +443,7 @@ xdmcp_client_class_init (XDMCPClientClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (XDMCPClientClass, query),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__VOID,
+                      NULL,
                       G_TYPE_NONE, 0);
     xdmcp_client_signals[XDMCP_CLIENT_WILLING] =
         g_signal_new ("willing",
@@ -451,7 +451,7 @@ xdmcp_client_class_init (XDMCPClientClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (XDMCPClientClass, willing),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__POINTER,
+                      NULL,
                       G_TYPE_NONE, 1, G_TYPE_POINTER);
     xdmcp_client_signals[XDMCP_CLIENT_ACCEPT] =
         g_signal_new ("accept",
@@ -459,7 +459,7 @@ xdmcp_client_class_init (XDMCPClientClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (XDMCPClientClass, accept),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__POINTER,
+                      NULL,
                       G_TYPE_NONE, 1, G_TYPE_POINTER);
     xdmcp_client_signals[XDMCP_CLIENT_DECLINE] =
         g_signal_new ("decline",
@@ -467,7 +467,7 @@ xdmcp_client_class_init (XDMCPClientClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (XDMCPClientClass, decline),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__POINTER,
+                      NULL,
                       G_TYPE_NONE, 1, G_TYPE_POINTER);
     xdmcp_client_signals[XDMCP_CLIENT_FAILED] =
         g_signal_new ("failed",
@@ -475,6 +475,6 @@ xdmcp_client_class_init (XDMCPClientClass *klass)
                       G_SIGNAL_RUN_LAST,
                       G_STRUCT_OFFSET (XDMCPClientClass, failed),
                       NULL, NULL,
-                      g_cclosure_marshal_VOID__POINTER,
+                      NULL,
                       G_TYPE_NONE, 1, G_TYPE_POINTER);
 }