Commit ec98953e authored by Johan Dahlin's avatar Johan Dahlin Committed by Johan Dahlin

Pass in NULL instead of g_cclosure_marshal_generic

NULL is now a shortcut for g_cclosure_marshal_generic, so avoid
referencing it directly.

https://bugzilla.gnome.org/show_bug.cgi?id=654917
parent fa2861e3
......@@ -123,7 +123,7 @@ g_action_group_default_init (GActionGroupInterface *class)
G_STRUCT_OFFSET (GActionGroupInterface,
action_enabled_changed),
NULL, NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_NONE, 2,
G_TYPE_STRING,
G_TYPE_BOOLEAN);
......@@ -147,7 +147,7 @@ g_action_group_default_init (GActionGroupInterface *class)
G_STRUCT_OFFSET (GActionGroupInterface,
action_state_changed),
NULL, NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_NONE, 2,
G_TYPE_STRING,
G_TYPE_VARIANT);
......
......@@ -606,7 +606,7 @@ g_application_class_init (GApplicationClass *class)
g_application_signals[SIGNAL_OPEN] =
g_signal_new ("open", G_TYPE_APPLICATION, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GApplicationClass, open),
NULL, NULL, g_cclosure_marshal_generic,
NULL, NULL, NULL,
G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_INT, G_TYPE_STRING);
/**
......@@ -626,7 +626,7 @@ g_application_class_init (GApplicationClass *class)
g_signal_new ("command-line", G_TYPE_APPLICATION, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GApplicationClass, command_line),
g_signal_accumulator_first_wins, NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_INT, 1, G_TYPE_APPLICATION_COMMAND_LINE);
g_type_class_add_private (class, sizeof (GApplicationPrivate));
......
......@@ -159,7 +159,7 @@ g_dbus_auth_observer_class_init (GDBusAuthObserverClass *klass)
G_STRUCT_OFFSET (GDBusAuthObserverClass, authorize_authenticated_peer),
_g_signal_accumulator_false_handled,
NULL, /* accu_data */
g_cclosure_marshal_generic,
NULL,
G_TYPE_BOOLEAN,
2,
G_TYPE_IO_STREAM,
......
......@@ -899,7 +899,7 @@ g_dbus_connection_class_init (GDBusConnectionClass *klass)
G_STRUCT_OFFSET (GDBusConnectionClass, closed),
NULL,
NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_NONE,
2,
G_TYPE_BOOLEAN,
......
......@@ -216,7 +216,7 @@ g_dbus_interface_skeleton_class_init (GDBusInterfaceSkeletonClass *klass)
G_STRUCT_OFFSET (GDBusInterfaceSkeletonClass, g_authorize_method),
_g_signal_accumulator_false_handled,
NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_BOOLEAN,
1,
G_TYPE_DBUS_METHOD_INVOCATION);
......
......@@ -108,7 +108,7 @@ g_dbus_object_manager_default_init (GDBusObjectManagerIface *iface)
G_STRUCT_OFFSET (GDBusObjectManagerIface, interface_added),
NULL,
NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_NONE,
2,
G_TYPE_DBUS_OBJECT,
......@@ -133,7 +133,7 @@ g_dbus_object_manager_default_init (GDBusObjectManagerIface *iface)
G_STRUCT_OFFSET (GDBusObjectManagerIface, interface_removed),
NULL,
NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_NONE,
2,
G_TYPE_DBUS_OBJECT,
......
......@@ -513,7 +513,7 @@ g_dbus_object_manager_client_class_init (GDBusObjectManagerClientClass *klass)
G_STRUCT_OFFSET (GDBusObjectManagerClientClass, interface_proxy_signal),
NULL,
NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_NONE,
5,
G_TYPE_DBUS_OBJECT_PROXY,
......@@ -551,7 +551,7 @@ g_dbus_object_manager_client_class_init (GDBusObjectManagerClientClass *klass)
G_STRUCT_OFFSET (GDBusObjectManagerClientClass, interface_proxy_properties_changed),
NULL,
NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_NONE,
4,
G_TYPE_DBUS_OBJECT_PROXY,
......
......@@ -186,7 +186,7 @@ g_dbus_object_skeleton_class_init (GDBusObjectSkeletonClass *klass)
G_STRUCT_OFFSET (GDBusObjectSkeletonClass, authorize_method),
_g_signal_accumulator_false_handled,
NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_BOOLEAN,
2,
G_TYPE_DBUS_INTERFACE_SKELETON,
......
......@@ -566,7 +566,7 @@ g_dbus_proxy_class_init (GDBusProxyClass *klass)
G_STRUCT_OFFSET (GDBusProxyClass, g_properties_changed),
NULL,
NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_NONE,
2,
G_TYPE_VARIANT,
......@@ -589,7 +589,7 @@ g_dbus_proxy_class_init (GDBusProxyClass *klass)
G_STRUCT_OFFSET (GDBusProxyClass, g_signal),
NULL,
NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_NONE,
3,
G_TYPE_STRING,
......
......@@ -425,7 +425,7 @@ g_dbus_server_class_init (GDBusServerClass *klass)
G_STRUCT_OFFSET (GDBusServerClass, new_connection),
g_signal_accumulator_true_handled,
NULL, /* accu_data */
g_cclosure_marshal_generic,
NULL,
G_TYPE_BOOLEAN,
1,
G_TYPE_DBUS_CONNECTION);
......
......@@ -240,7 +240,7 @@ g_file_monitor_class_init (GFileMonitorClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GFileMonitorClass, changed),
NULL, NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_NONE, 3,
G_TYPE_FILE, G_TYPE_FILE, G_TYPE_FILE_MONITOR_EVENT);
......
......@@ -275,7 +275,7 @@ g_mount_operation_class_init (GMountOperationClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GMountOperationClass, ask_password),
NULL, NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_NONE, 4,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_ASK_PASSWORD_FLAGS);
......@@ -298,7 +298,7 @@ g_mount_operation_class_init (GMountOperationClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GMountOperationClass, ask_question),
NULL, NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_NONE, 2,
G_TYPE_STRING, G_TYPE_STRV);
......@@ -367,7 +367,7 @@ g_mount_operation_class_init (GMountOperationClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GMountOperationClass, show_processes),
NULL, NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_NONE, 3,
G_TYPE_STRING, G_TYPE_ARRAY, G_TYPE_STRV);
......
......@@ -620,7 +620,7 @@ g_settings_class_init (GSettingsClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GSettingsClass, change_event),
g_signal_accumulator_true_handled, NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_BOOLEAN, 2, G_TYPE_POINTER, G_TYPE_INT);
/**
......@@ -674,7 +674,7 @@ g_settings_class_init (GSettingsClass *class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GSettingsClass, writable_change_event),
g_signal_accumulator_true_handled, NULL,
g_cclosure_marshal_generic, G_TYPE_BOOLEAN, 1, G_TYPE_UINT);
NULL, G_TYPE_BOOLEAN, 1, G_TYPE_UINT);
/**
* GSettings:context:
......
......@@ -270,7 +270,7 @@ g_socket_service_class_init (GSocketServiceClass *class)
g_signal_new ("incoming", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GSocketServiceClass, incoming),
g_signal_accumulator_true_handled, NULL,
g_cclosure_marshal_generic, G_TYPE_BOOLEAN,
NULL, G_TYPE_BOOLEAN,
2, G_TYPE_SOCKET_CONNECTION, G_TYPE_OBJECT);
}
......
......@@ -238,7 +238,7 @@ g_threaded_socket_service_class_init (GThreadedSocketServiceClass *class)
g_signal_new ("run", G_TYPE_FROM_CLASS (class), G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GThreadedSocketServiceClass, run),
g_signal_accumulator_true_handled, NULL,
g_cclosure_marshal_generic, G_TYPE_BOOLEAN,
NULL, G_TYPE_BOOLEAN,
2, G_TYPE_SOCKET_CONNECTION, G_TYPE_OBJECT);
g_object_class_install_property (gobject_class, PROP_MAX_THREADS,
......
......@@ -264,7 +264,7 @@ g_tls_connection_class_init (GTlsConnectionClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GTlsConnectionClass, accept_certificate),
g_signal_accumulator_true_handled, NULL,
g_cclosure_marshal_generic,
NULL,
G_TYPE_BOOLEAN, 2,
G_TYPE_TLS_CERTIFICATE,
G_TYPE_TLS_CERTIFICATE_FLAGS);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment