trivial: Rename the FuPluginClass signals callbacks

The aim is to fold FuPluginVfuncs into this, and the names clash.
This commit is contained in:
Richard Hughes 2022-09-28 13:04:09 +01:00
parent 2a5f7766a4
commit f8400ffaae
2 changed files with 14 additions and 14 deletions

View File

@ -2678,7 +2678,7 @@ fu_plugin_class_init(FuPluginClass *klass)
signals[SIGNAL_DEVICE_ADDED] = g_signal_new("device-added", signals[SIGNAL_DEVICE_ADDED] = g_signal_new("device-added",
G_TYPE_FROM_CLASS(object_class), G_TYPE_FROM_CLASS(object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(FuPluginClass, device_added), G_STRUCT_OFFSET(FuPluginClass, _device_added),
NULL, NULL,
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT, g_cclosure_marshal_VOID__OBJECT,
@ -2698,7 +2698,7 @@ fu_plugin_class_init(FuPluginClass *klass)
g_signal_new("device-removed", g_signal_new("device-removed",
G_TYPE_FROM_CLASS(object_class), G_TYPE_FROM_CLASS(object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(FuPluginClass, device_removed), G_STRUCT_OFFSET(FuPluginClass, _device_removed),
NULL, NULL,
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT, g_cclosure_marshal_VOID__OBJECT,
@ -2718,7 +2718,7 @@ fu_plugin_class_init(FuPluginClass *klass)
g_signal_new("device-register", g_signal_new("device-register",
G_TYPE_FROM_CLASS(object_class), G_TYPE_FROM_CLASS(object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(FuPluginClass, device_register), G_STRUCT_OFFSET(FuPluginClass, _device_register),
NULL, NULL,
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT, g_cclosure_marshal_VOID__OBJECT,
@ -2741,7 +2741,7 @@ fu_plugin_class_init(FuPluginClass *klass)
g_signal_new("check-supported", g_signal_new("check-supported",
G_TYPE_FROM_CLASS(object_class), G_TYPE_FROM_CLASS(object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(FuPluginClass, check_supported), G_STRUCT_OFFSET(FuPluginClass, _check_supported),
NULL, NULL,
NULL, NULL,
g_cclosure_marshal_generic, g_cclosure_marshal_generic,
@ -2751,7 +2751,7 @@ fu_plugin_class_init(FuPluginClass *klass)
signals[SIGNAL_RULES_CHANGED] = g_signal_new("rules-changed", signals[SIGNAL_RULES_CHANGED] = g_signal_new("rules-changed",
G_TYPE_FROM_CLASS(object_class), G_TYPE_FROM_CLASS(object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(FuPluginClass, rules_changed), G_STRUCT_OFFSET(FuPluginClass, _rules_changed),
NULL, NULL,
NULL, NULL,
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_VOID__VOID,
@ -2770,7 +2770,7 @@ fu_plugin_class_init(FuPluginClass *klass)
g_signal_new("config-changed", g_signal_new("config-changed",
G_TYPE_FROM_CLASS(object_class), G_TYPE_FROM_CLASS(object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET(FuPluginClass, config_changed), G_STRUCT_OFFSET(FuPluginClass, _config_changed),
NULL, NULL,
NULL, NULL,
g_cclosure_marshal_VOID__VOID, g_cclosure_marshal_VOID__VOID,

View File

@ -48,14 +48,14 @@ G_DECLARE_DERIVABLE_TYPE(FuPlugin, fu_plugin, FU, PLUGIN, FwupdPlugin)
struct _FuPluginClass { struct _FuPluginClass {
FwupdPluginClass parent_class; FwupdPluginClass parent_class;
/* signals */ /* signals */
void (*device_added)(FuPlugin *self, FuDevice *device); void (*_device_added)(FuPlugin *self, FuDevice *device);
void (*device_removed)(FuPlugin *self, FuDevice *device); void (*_device_removed)(FuPlugin *self, FuDevice *device);
void (*status_changed)(FuPlugin *self, FwupdStatus status); void (*_status_changed)(FuPlugin *self, FwupdStatus status);
void (*percentage_changed)(FuPlugin *self, guint percentage); void (*_percentage_changed)(FuPlugin *self, guint percentage);
void (*device_register)(FuPlugin *self, FuDevice *device); void (*_device_register)(FuPlugin *self, FuDevice *device);
gboolean (*check_supported)(FuPlugin *self, const gchar *guid); gboolean (*_check_supported)(FuPlugin *self, const gchar *guid);
void (*rules_changed)(FuPlugin *self); void (*_rules_changed)(FuPlugin *self);
void (*config_changed)(FuPlugin *self); void (*_config_changed)(FuPlugin *self);
}; };
/** /**