[glib/wip/chergert/marshall-matters: 34/35] gio: ensure default va_marshaller is used
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/chergert/marshall-matters: 34/35] gio: ensure default va_marshaller is used
- Date: Mon, 10 Jun 2019 11:26:04 +0000 (UTC)
commit 6327afbec84f50c361a547eebeda968f824f6e58
Author: Christian Hergert <chergert redhat com>
Date: Thu May 30 19:13:37 2019 -0700
gio: ensure default va_marshaller is used
If c_marshaller is provided during g_signal_new() registration, the
automatic va_marshaller will not be set. If we leave the c_marshaller as
NULL in the simple cases, both a c_marshaller and va_marshaller will be
set for us.
This is particularly helpful when dealing with stack traces from Linux
perf, which often cannot unwind the stack beyond the ffi_call_unix64
stack-frame on x86_64.
Related to GNOME/Initiatives#10
gio/gactiongroup.c | 4 ++--
gio/gapplication.c | 6 +++---
gio/gcancellable.c | 2 +-
gio/gdbusdaemon.c | 2 +-
gio/gdbusobject.c | 4 ++--
gio/gdrive.c | 8 ++++----
gio/gfilenamecompleter.c | 2 +-
gio/gmount.c | 6 +++---
gio/gmountoperation.c | 4 ++--
gio/gnetworkmonitor.c | 2 +-
gio/gresolver.c | 2 +-
gio/gsettings.c | 4 ++--
gio/gsimpleaction.c | 4 ++--
gio/gunixmounts.c | 4 ++--
gio/gvolume.c | 4 ++--
gio/gvolumemonitor.c | 24 ++++++++++++------------
16 files changed, 41 insertions(+), 41 deletions(-)
---
diff --git a/gio/gactiongroup.c b/gio/gactiongroup.c
index 6d361f228..cb10d8667 100644
--- a/gio/gactiongroup.c
+++ b/gio/gactiongroup.c
@@ -260,7 +260,7 @@ g_action_group_default_init (GActionGroupInterface *iface)
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
G_STRUCT_OFFSET (GActionGroupInterface, action_added),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
@@ -281,7 +281,7 @@ g_action_group_default_init (GActionGroupInterface *iface)
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
G_STRUCT_OFFSET (GActionGroupInterface, action_removed),
NULL, NULL,
- g_cclosure_marshal_VOID__STRING,
+ NULL,
G_TYPE_NONE, 1,
G_TYPE_STRING);
diff --git a/gio/gapplication.c b/gio/gapplication.c
index b154cbe6a..3fbae406c 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -1532,7 +1532,7 @@ g_application_class_init (GApplicationClass *class)
g_application_signals[SIGNAL_STARTUP] =
g_signal_new (I_("startup"), G_TYPE_APPLICATION, G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GApplicationClass, startup),
- NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ NULL, NULL, NULL, G_TYPE_NONE, 0);
/**
* GApplication::shutdown:
@@ -1544,7 +1544,7 @@ g_application_class_init (GApplicationClass *class)
g_application_signals[SIGNAL_SHUTDOWN] =
g_signal_new (I_("shutdown"), G_TYPE_APPLICATION, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GApplicationClass, shutdown),
- NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ NULL, NULL, NULL, G_TYPE_NONE, 0);
/**
* GApplication::activate:
@@ -1556,7 +1556,7 @@ g_application_class_init (GApplicationClass *class)
g_application_signals[SIGNAL_ACTIVATE] =
g_signal_new (I_("activate"), G_TYPE_APPLICATION, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GApplicationClass, activate),
- NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ NULL, NULL, NULL, G_TYPE_NONE, 0);
/**
diff --git a/gio/gcancellable.c b/gio/gcancellable.c
index 31e990f3c..0cfa91c0b 100644
--- a/gio/gcancellable.c
+++ b/gio/gcancellable.c
@@ -141,7 +141,7 @@ g_cancellable_class_init (GCancellableClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GCancellableClass, cancelled),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
}
diff --git a/gio/gdbusdaemon.c b/gio/gdbusdaemon.c
index a9b626215..7636514b3 100644
--- a/gio/gdbusdaemon.c
+++ b/gio/gdbusdaemon.c
@@ -1706,7 +1706,7 @@ g_dbus_daemon_class_init (GDBusDaemonClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
g_object_class_install_property (gobject_class,
diff --git a/gio/gdbusobject.c b/gio/gdbusobject.c
index 3c52a6a84..32393edf6 100644
--- a/gio/gdbusobject.c
+++ b/gio/gdbusobject.c
@@ -65,7 +65,7 @@ g_dbus_object_default_init (GDBusObjectIface *iface)
G_STRUCT_OFFSET (GDBusObjectIface, interface_added),
NULL,
NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_DBUS_INTERFACE);
@@ -85,7 +85,7 @@ g_dbus_object_default_init (GDBusObjectIface *iface)
G_STRUCT_OFFSET (GDBusObjectIface, interface_removed),
NULL,
NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE,
1,
G_TYPE_DBUS_INTERFACE);
diff --git a/gio/gdrive.c b/gio/gdrive.c
index 24784f3df..08f72b23b 100644
--- a/gio/gdrive.c
+++ b/gio/gdrive.c
@@ -78,7 +78,7 @@ g_drive_default_init (GDriveInterface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GDriveIface, changed),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -95,7 +95,7 @@ g_drive_default_init (GDriveInterface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GDriveIface, disconnected),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -110,7 +110,7 @@ g_drive_default_init (GDriveInterface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GDriveIface, eject_button),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -127,7 +127,7 @@ g_drive_default_init (GDriveInterface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GDriveIface, stop_button),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
}
diff --git a/gio/gfilenamecompleter.c b/gio/gfilenamecompleter.c
index 2550fecec..5883b8004 100644
--- a/gio/gfilenamecompleter.c
+++ b/gio/gfilenamecompleter.c
@@ -105,7 +105,7 @@ g_filename_completer_class_init (GFilenameCompleterClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GFilenameCompleterClass, got_completion_data),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
}
diff --git a/gio/gmount.c b/gio/gmount.c
index dad4b8513..55caaa6bd 100644
--- a/gio/gmount.c
+++ b/gio/gmount.c
@@ -78,7 +78,7 @@ g_mount_default_init (GMountInterface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GMountIface, changed),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -95,7 +95,7 @@ g_mount_default_init (GMountInterface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GMountIface, unmounted),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
/**
* GMount::pre-unmount:
@@ -114,7 +114,7 @@ g_mount_default_init (GMountInterface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GMountIface, pre_unmount),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
}
diff --git a/gio/gmountoperation.c b/gio/gmountoperation.c
index 76a5024ff..b6982a96e 100644
--- a/gio/gmountoperation.c
+++ b/gio/gmountoperation.c
@@ -361,7 +361,7 @@ g_mount_operation_class_init (GMountOperationClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GMountOperationClass, reply),
NULL, NULL,
- g_cclosure_marshal_VOID__ENUM,
+ NULL,
G_TYPE_NONE, 1,
G_TYPE_MOUNT_OPERATION_RESULT);
@@ -382,7 +382,7 @@ g_mount_operation_class_init (GMountOperationClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GMountOperationClass, aborted),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
/**
diff --git a/gio/gnetworkmonitor.c b/gio/gnetworkmonitor.c
index 657c7047a..d65fc2bc4 100644
--- a/gio/gnetworkmonitor.c
+++ b/gio/gnetworkmonitor.c
@@ -321,7 +321,7 @@ g_network_monitor_default_init (GNetworkMonitorInterface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GNetworkMonitorInterface, network_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__BOOLEAN,
+ NULL,
G_TYPE_NONE, 1,
G_TYPE_BOOLEAN);
diff --git a/gio/gresolver.c b/gio/gresolver.c
index 3e61ccaff..732d21709 100644
--- a/gio/gresolver.c
+++ b/gio/gresolver.c
@@ -169,7 +169,7 @@ g_resolver_class_init (GResolverClass *resolver_class)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GResolverClass, reload),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
}
diff --git a/gio/gsettings.c b/gio/gsettings.c
index dd8f94485..edea3c095 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -743,7 +743,7 @@ g_settings_class_init (GSettingsClass *class)
g_signal_new (I_("changed"), G_TYPE_SETTINGS,
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
G_STRUCT_OFFSET (GSettingsClass, changed),
- NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE,
+ NULL, NULL, NULL, G_TYPE_NONE,
1, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE);
/**
@@ -797,7 +797,7 @@ g_settings_class_init (GSettingsClass *class)
g_signal_new (I_("writable-changed"), G_TYPE_SETTINGS,
G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
G_STRUCT_OFFSET (GSettingsClass, writable_changed),
- NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE,
+ NULL, NULL, NULL, G_TYPE_NONE,
1, G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE);
/**
diff --git a/gio/gsimpleaction.c b/gio/gsimpleaction.c
index c788252bb..499adb25a 100644
--- a/gio/gsimpleaction.c
+++ b/gio/gsimpleaction.c
@@ -395,7 +395,7 @@ g_simple_action_class_init (GSimpleActionClass *class)
G_TYPE_SIMPLE_ACTION,
G_SIGNAL_RUN_LAST | G_SIGNAL_MUST_COLLECT,
0, NULL, NULL,
- g_cclosure_marshal_VOID__VARIANT,
+ NULL,
G_TYPE_NONE, 1,
G_TYPE_VARIANT);
@@ -445,7 +445,7 @@ g_simple_action_class_init (GSimpleActionClass *class)
G_TYPE_SIMPLE_ACTION,
G_SIGNAL_RUN_LAST | G_SIGNAL_MUST_COLLECT,
0, NULL, NULL,
- g_cclosure_marshal_VOID__VARIANT,
+ NULL,
G_TYPE_NONE, 1,
G_TYPE_VARIANT);
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 44a4b113d..cf73fe5e0 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -1929,7 +1929,7 @@ g_unix_mount_monitor_class_init (GUnixMountMonitorClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -1944,7 +1944,7 @@ g_unix_mount_monitor_class_init (GUnixMountMonitorClass *klass)
G_SIGNAL_RUN_LAST,
0,
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
}
diff --git a/gio/gvolume.c b/gio/gvolume.c
index dd49df7d6..0e14ddaf6 100644
--- a/gio/gvolume.c
+++ b/gio/gvolume.c
@@ -93,7 +93,7 @@ g_volume_default_init (GVolumeInterface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeIface, changed),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
/**
@@ -108,7 +108,7 @@ g_volume_default_init (GVolumeInterface *iface)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeIface, removed),
NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
+ NULL,
G_TYPE_NONE, 0);
}
diff --git a/gio/gvolumemonitor.c b/gio/gvolumemonitor.c
index 1718bb6a5..65ec955a9 100644
--- a/gio/gvolumemonitor.c
+++ b/gio/gvolumemonitor.c
@@ -94,7 +94,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, volume_added),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_VOLUME);
/**
@@ -109,7 +109,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, volume_removed),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_VOLUME);
/**
@@ -124,7 +124,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, volume_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_VOLUME);
/**
@@ -139,7 +139,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, mount_added),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_MOUNT);
/**
@@ -154,7 +154,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, mount_removed),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_MOUNT);
/**
@@ -172,7 +172,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, mount_pre_unmount),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_MOUNT);
/**
@@ -187,7 +187,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, mount_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_MOUNT);
/**
@@ -202,7 +202,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, drive_connected),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_DRIVE);
/**
@@ -217,7 +217,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, drive_disconnected),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_DRIVE);
/**
@@ -232,7 +232,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, drive_changed),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_DRIVE);
/**
@@ -249,7 +249,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, drive_eject_button),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_DRIVE);
/**
@@ -266,7 +266,7 @@ g_volume_monitor_class_init (GVolumeMonitorClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GVolumeMonitorClass, drive_stop_button),
NULL, NULL,
- g_cclosure_marshal_VOID__OBJECT,
+ NULL,
G_TYPE_NONE, 1, G_TYPE_DRIVE);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
