proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-07-24 19:26:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Cast the g_signal_connect() object to allow static analysis

Browse Source 
This is useful when using https://gitlab.freedesktop.org/tartan/tartan
This commit is contained in:
Richard Hughes 2021-12-31 10:23:51 +00:00
parent 7c4eb1bf92
commit e17a107ce1
35 changed files with 283 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libfwupd/fwupd-client.c
View File

@ -683,11 +683,14 @@ fwupd_client_connect_get_proxy_cb(GObject *source, GAsyncResult *res, gpointer u
priv->proxy = g_steal_pointer(&proxy);
/* connect signals, etc. */
g_signal_connect(priv->proxy,
g_signal_connect(G_DBUS_PROXY(priv->proxy),
"g-properties-changed",
G_CALLBACK(fwupd_client_properties_changed_cb),
self);
g_signal_connect(priv->proxy, "g-signal", G_CALLBACK(fwupd_client_signal_cb), self);
g_signal_connect(G_DBUS_PROXY(priv->proxy),
"g-signal",
G_CALLBACK(fwupd_client_signal_cb),
self);
val = g_dbus_proxy_get_cached_property(priv->proxy, "DaemonVersion");
if (val != NULL)
fwupd_client_set_daemon_version(self, g_variant_get_string(val, NULL));

10
libfwupd/fwupd-context-test.c
View File

@ -101,8 +101,14 @@ main(void)
g_message("Created FwupdClient in thread %p with main context %p",
g_thread_self(),
g_main_context_get_thread_default());
g_signal_connect(client, "notify::status", G_CALLBACK(fwupd_thread_test_notify_cb), &self);
g_signal_connect(app, "activate", G_CALLBACK(fwupd_thread_test_activate_cb), &self);
g_signal_connect(FWUPD_CLIENT(client),
"notify::status",
G_CALLBACK(fwupd_thread_test_notify_cb),
&self);
g_signal_connect(G_APPLICATION(app),
"activate",
G_CALLBACK(fwupd_thread_test_activate_cb),
&self);
retval = g_application_run(app, 0, NULL);
if (self.worker_thread != NULL)
g_thread_join(g_steal_pointer(&self.worker_thread));

5
libfwupd/fwupd-thread-test.c
View File

@ -97,7 +97,10 @@ main(void)
g_message("Created FwupdClient in thread %p with main context %p",
g_thread_self(),
g_main_context_get_thread_default());
g_signal_connect(app, "activate", G_CALLBACK(fwupd_thread_test_activate_cb), &self);
g_signal_connect(G_APPLICATION(app),
"activate",
G_CALLBACK(fwupd_thread_test_activate_cb),
&self);
retval = g_application_run(app, 0, NULL);
for (guint i = 0; i < self.worker_threads->len; i++) {
GThread *thread = g_ptr_array_index(self.worker_threads, i);

2
libfwupdplugin/fu-bluez-device.c
View File

@ -117,7 +117,7 @@ fu_bluez_device_ensure_uuid_helper_proxy(FuBluezDeviceUuidHelper *uuid_helper, G
return FALSE;
}
g_dbus_proxy_set_default_timeout(uuid_helper->proxy, DEFAULT_PROXY_TIMEOUT);
uuid_helper->signal_id = g_signal_connect(uuid_helper->proxy,
uuid_helper->signal_id = g_signal_connect(G_DBUS_PROXY(uuid_helper->proxy),
"g-properties-changed",
G_CALLBACK(fu_bluez_device_signal_cb),
uuid_helper);

6
libfwupdplugin/fu-device.c
View File

@ -4878,8 +4878,10 @@ fu_device_init(FuDevice *self)
priv->retry_recs = g_ptr_array_new_with_free_func(g_free);
g_rw_lock_init(&priv->parent_guids_mutex);
g_rw_lock_init(&priv->metadata_mutex);
priv->notify_flags_handler_id =
g_signal_connect(self, "notify::flags", G_CALLBACK(fu_device_flags_notify_cb), NULL);
priv->notify_flags_handler_id = g_signal_connect(FWUPD_DEVICE(self),
"notify::flags",
G_CALLBACK(fu_device_flags_notify_cb),
NULL);
}
static void

9
libfwupdplugin/fu-plugin.c
View File

@ -493,8 +493,11 @@ fu_plugin_device_add(FuPlugin *self, FuDevice *device)
}
/* watch to see if children are added or removed at runtime */
g_signal_connect(device, "child-added", G_CALLBACK(fu_plugin_device_child_added_cb), self);
g_signal_connect(device,
g_signal_connect(FU_DEVICE(device),
"child-added",
G_CALLBACK(fu_plugin_device_child_added_cb),
self);
g_signal_connect(FU_DEVICE(device),
"child-removed",
G_CALLBACK(fu_plugin_device_child_removed_cb),
self);
@ -832,7 +835,7 @@ fu_plugin_runner_startup(FuPlugin *self, GError **error)
priv->config_monitor = g_file_monitor_file(file, G_FILE_MONITOR_NONE, NULL, error);
if (priv->config_monitor == NULL)
return FALSE;
g_signal_connect(priv->config_monitor,
g_signal_connect(G_FILE_MONITOR(priv->config_monitor),
"changed",
G_CALLBACK(fu_plugin_config_monitor_changed_cb),
self);

4
libfwupdplugin/fu-progress.c
View File

@ -671,11 +671,11 @@ fu_progress_get_child(FuProgress *self)
/* connect up signals */
priv->child = fu_progress_new(NULL);
priv->percentage_child_id =
g_signal_connect(priv->child,
g_signal_connect(FU_PROGRESS(priv->child),
"percentage-changed",
G_CALLBACK(fu_progress_child_percentage_changed_cb),
self);
priv->status_child_id = g_signal_connect(priv->child,
priv->status_child_id = g_signal_connect(FU_PROGRESS(priv->child),
"status-changed",
G_CALLBACK(fu_progress_child_status_changed_cb),
self);

13
libfwupdplugin/fu-self-test.c
View File

@ -719,8 +719,11 @@ fu_plugin_delay_func(void)
g_autoptr(FuDevice) device = NULL;
plugin = fu_plugin_new(NULL);
g_signal_connect(plugin, "device-added", G_CALLBACK(_plugin_device_added_cb), &device_tmp);
g_signal_connect(plugin,
g_signal_connect(FU_PLUGIN(plugin),
"device-added",
G_CALLBACK(_plugin_device_added_cb),
&device_tmp);
g_signal_connect(FU_PLUGIN(plugin),
"device-removed",
G_CALLBACK(_plugin_device_added_cb),
&device_tmp);
@ -3591,7 +3594,7 @@ fu_progress_func(void)
FuProgressHelper helper = {0};
g_autoptr(FuProgress) progress = fu_progress_new(G_STRLOC);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"percentage-changed",
G_CALLBACK(fu_progress_percentage_changed_cb),
&helper);
@ -3617,7 +3620,7 @@ fu_progress_child_func(void)
/* reset */
fu_progress_set_steps(progress, 2);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"percentage-changed",
G_CALLBACK(fu_progress_percentage_changed_cb),
&helper);
@ -3667,7 +3670,7 @@ fu_progress_parent_one_step_proxy_func(void)
/* one step */
fu_progress_set_steps(progress, 1);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"percentage-changed",
G_CALLBACK(fu_progress_percentage_changed_cb),
&helper);

8
plugins/dell/fu-self-test.c
View File

@ -93,12 +93,12 @@ fu_plugin_dell_tpm_func(gconstpointer user_data)
memset(&tpm_out, 0x0, sizeof(tpm_out));
devices = g_ptr_array_new_with_free_func((GDestroyNotify)g_object_unref);
added_id = g_signal_connect(self->plugin_uefi_capsule,
added_id = g_signal_connect(FU_PLUGIN(self->plugin_uefi_capsule),
"device-added",
G_CALLBACK(_plugin_device_added_cb),
devices);
register_id = g_signal_connect(self->plugin_dell,
register_id = g_signal_connect(FU_PLUGIN(self->plugin_dell),
"device-register",
G_CALLBACK(fu_engine_plugin_device_register_cb),
self->plugin_uefi_capsule);
@ -274,11 +274,11 @@ fu_plugin_dell_dock_func(gconstpointer user_data)
fake_usb_device =
fu_usb_device_new_with_context(fu_plugin_get_context(self->plugin_dell), NULL);
devices = g_ptr_array_new_with_free_func((GDestroyNotify)g_object_unref);
added_id = g_signal_connect(self->plugin_uefi_capsule,
added_id = g_signal_connect(FU_PLUGIN(self->plugin_uefi_capsule),
"device-added",
G_CALLBACK(_plugin_device_added_cb),
devices);
register_id = g_signal_connect(self->plugin_dell,
register_id = g_signal_connect(FU_PLUGIN(self->plugin_dell),
"device-register",
G_CALLBACK(fu_engine_plugin_device_register_cb),
self->plugin_uefi_capsule);

28
plugins/dfu/fu-dfu-tool.c
View File

@ -483,8 +483,11 @@ fu_dfu_tool_read_alt(FuDfuTool *self, gchar **values, GError **error)
return FALSE;
/* set up progress */
g_signal_connect(progress, "status-changed", G_CALLBACK(fu_tool_action_changed_cb), self);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"status-changed",
G_CALLBACK(fu_tool_action_changed_cb),
self);
g_signal_connect(FU_PROGRESS(progress),
"percentage-changed",
G_CALLBACK(fu_tool_action_changed_cb),
self);
@ -592,8 +595,11 @@ fu_dfu_tool_read(FuDfuTool *self, gchar **values, GError **error)
}
/* transfer */
g_signal_connect(progress, "status-changed", G_CALLBACK(fu_tool_action_changed_cb), self);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"status-changed",
G_CALLBACK(fu_tool_action_changed_cb),
self);
g_signal_connect(FU_PROGRESS(progress),
"percentage-changed",
G_CALLBACK(fu_tool_action_changed_cb),
self);
@ -667,8 +673,11 @@ fu_dfu_tool_write_alt(FuDfuTool *self, gchar **values, GError **error)
return FALSE;
/* set up progress */
g_signal_connect(progress, "status-changed", G_CALLBACK(fu_tool_action_changed_cb), self);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"status-changed",
G_CALLBACK(fu_tool_action_changed_cb),
self);
g_signal_connect(FU_PROGRESS(progress),
"percentage-changed",
G_CALLBACK(fu_tool_action_changed_cb),
self);
@ -798,8 +807,11 @@ fu_dfu_tool_write(FuDfuTool *self, gchar **values, GError **error)
}
/* transfer */
g_signal_connect(progress, "status-changed", G_CALLBACK(fu_tool_action_changed_cb), self);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"status-changed",
G_CALLBACK(fu_tool_action_changed_cb),
self);
g_signal_connect(FU_PROGRESS(progress),
"percentage-changed",
G_CALLBACK(fu_tool_action_changed_cb),
self);

2
plugins/lenovo-thinklmi/fu-self-test.c
View File

@ -75,7 +75,7 @@ fu_test_probe_fake_esrt(FuTest *self)
FuDevice *dev = NULL;
g_autoptr(GError) error = NULL;
added_id = g_signal_connect(self->plugin_uefi_capsule,
added_id = g_signal_connect(FU_PLUGIN(self->plugin_uefi_capsule),
"device-added",
G_CALLBACK(_plugin_device_added_cb),
&dev);

2
plugins/linux-lockdown/fu-plugin-linux-lockdown.c
View File

@ -106,7 +106,7 @@ fu_plugin_linux_lockdown_startup(FuPlugin *plugin, GError **error)
data->monitor = g_file_monitor(data->file, G_FILE_MONITOR_NONE, NULL, error);
if (data->monitor == NULL)
return FALSE;
g_signal_connect(data->monitor,
g_signal_connect(G_FILE_MONITOR(data->monitor),
"changed",
G_CALLBACK(fu_plugin_linux_lockdown_changed_cb),
plugin);

2
plugins/linux-swap/fu-plugin-linux-swap.c
View File

@ -58,7 +58,7 @@ fu_plugin_linux_swap_startup(FuPlugin *plugin, GError **error)
data->monitor = g_file_monitor(data->file, G_FILE_MONITOR_NONE, NULL, error);
if (data->monitor == NULL)
return FALSE;
g_signal_connect(data->monitor,
g_signal_connect(G_FILE_MONITOR(data->monitor),
"changed",
G_CALLBACK(fu_plugin_linux_swap_changed_cb),
plugin);

2
plugins/linux-tainted/fu-plugin-linux-tainted.c
View File

@ -56,7 +56,7 @@ fu_plugin_linux_tainted_startup(FuPlugin *plugin, GError **error)
data->monitor = g_file_monitor(data->file, G_FILE_MONITOR_NONE, NULL, error);
if (data->monitor == NULL)
return FALSE;
g_signal_connect(data->monitor,
g_signal_connect(G_FILE_MONITOR(data->monitor),
"changed",
G_CALLBACK(fu_plugin_linux_tainted_changed_cb),
plugin);

10
plugins/modem-manager/fu-plugin-modem-manager.c
View File

@ -203,7 +203,7 @@ fu_plugin_mm_inhibit_device(FuPlugin *plugin, FuDevice *device, GError **error)
if (fu_mm_device_get_update_methods(FU_MM_DEVICE(device)) &
MM_MODEM_FIRMWARE_UPDATE_METHOD_FASTBOOT) {
priv->udev_client = g_udev_client_new(subsystems);
g_signal_connect(priv->udev_client,
g_signal_connect(G_UDEV_CLIENT(priv->udev_client),
"uevent",
G_CALLBACK(fu_plugin_mm_udev_uevent_cb),
plugin);
@ -298,11 +298,11 @@ fu_plugin_mm_setup_manager(FuPlugin *plugin)
g_debug("ModemManager %s is available", version);
g_signal_connect(priv->manager,
g_signal_connect(G_DBUS_OBJECT_MANAGER(priv->manager),
"object-added",
G_CALLBACK(fu_plugin_mm_device_added_cb),
plugin);
g_signal_connect(priv->manager,
g_signal_connect(G_DBUS_OBJECT_MANAGER(priv->manager),
"object-removed",
G_CALLBACK(fu_plugin_mm_device_removed_cb),
plugin);
@ -335,7 +335,7 @@ static gboolean
fu_plugin_mm_coldplug(FuPlugin *plugin, GError **error)
{
FuPluginData *priv = fu_plugin_get_data(plugin);
g_signal_connect_swapped(priv->manager,
g_signal_connect_swapped(MM_MANAGER(priv->manager),
"notify::name-owner",
G_CALLBACK(fu_plugin_mm_name_owner_updated),
plugin);
@ -438,7 +438,7 @@ fu_plugin_mm_attach(FuPlugin *plugin, FuDevice *device, FuProgress *progress, GE
return FALSE;
/* this signal will always be emitted asynchronously */
g_signal_connect_swapped(device,
g_signal_connect_swapped(FU_DEVICE(device),
"attach-finished",
G_CALLBACK(fu_plugin_mm_device_attach_finished),
plugin);

6
plugins/modem-manager/fu-qmi-pdc-updater.c
View File

@ -377,7 +377,7 @@ fu_qmi_pdc_updater_load_config_ready(GObject *qmi_client, GAsyncResult *res, gpo
/* after receiving the response to our request, we now expect an indication
* with the actual result of the operation */
g_warn_if_fail(ctx->indication_id == 0);
ctx->indication_id = g_signal_connect(ctx->qmi_client,
ctx->indication_id = g_signal_connect(QMI_CLIENT_PDC(ctx->qmi_client),
"load-config",
G_CALLBACK(fu_qmi_pdc_updater_load_config_indication),
ctx);
@ -588,7 +588,7 @@ fu_qmi_pdc_updater_activate_config_ready(GObject *qmi_client, GAsyncResult *res,
*/
g_warn_if_fail(ctx->indication_id == 0);
ctx->indication_id =
g_signal_connect(ctx->qmi_client,
g_signal_connect(QMI_CLIENT_PDC(ctx->qmi_client),
"activate-config",
G_CALLBACK(fu_qmi_pdc_updater_activate_config_indication),
ctx);
@ -705,7 +705,7 @@ fu_qmi_pdc_updater_set_selected_config_ready(GObject *qmi_client,
* with the actual result of the operation */
g_warn_if_fail(ctx->indication_id == 0);
ctx->indication_id =
g_signal_connect(ctx->qmi_client,
g_signal_connect(QMI_CLIENT_PDC(ctx->qmi_client),
"set-selected-config",
G_CALLBACK(fu_qmi_pdc_updater_set_selected_config_indication),
ctx);

2
plugins/powerd/fu-plugin-powerd.c
View File

@ -136,7 +136,7 @@ fu_plugin_powerd_startup(FuPlugin *plugin, GError **error)
NULL,
G_SOURCE_REMOVE));
g_signal_connect(data->proxy,
g_signal_connect(G_DBUS_PROXY(data->proxy),
"g-signal",
G_CALLBACK(fu_plugin_powerd_proxy_changed_cb),
plugin);

10
plugins/synaptics-mst/fu-self-test.c
View File

@ -78,7 +78,10 @@ fu_plugin_synaptics_mst_none_func(void)
g_assert_no_error(error);
g_assert_true(ret);
g_signal_connect(plugin, "device-added", G_CALLBACK(_plugin_device_added_cb), &devices);
g_signal_connect(FU_PLUGIN(plugin),
"device-added",
G_CALLBACK(_plugin_device_added_cb),
&devices);
pluginfn = g_test_build_filename(G_TEST_BUILT,
"libfu_plugin_synaptics_mst." G_MODULE_SUFFIX,
NULL);
@ -120,7 +123,10 @@ fu_plugin_synaptics_mst_tb16_func(void)
g_assert_no_error(error);
g_assert_true(ret);
g_signal_connect(plugin, "device-added", G_CALLBACK(_plugin_device_added_cb), &devices);
g_signal_connect(FU_PLUGIN(plugin),
"device-added",
G_CALLBACK(_plugin_device_added_cb),
&devices);
pluginfn = g_test_build_filename(G_TEST_BUILT,
"libfu_plugin_synaptics_mst." G_MODULE_SUFFIX,
NULL);

19
plugins/thunderbolt/fu-self-test.c
View File

@ -509,9 +509,15 @@ mock_tree_sync(MockTree *root, FuPlugin *plugin, int timeout_ms)
.loop = mainloop,
};
id_add = g_signal_connect(plugin, "device-added", G_CALLBACK(sync_device_added), &ctx);
id_add = g_signal_connect(FU_PLUGIN(plugin),
"device-added",
G_CALLBACK(sync_device_added),
&ctx);
id_del = g_signal_connect(plugin, "device-removed", G_CALLBACK(sync_device_removed), &ctx);
id_del = g_signal_connect(FU_PLUGIN(plugin),
"device-removed",
G_CALLBACK(sync_device_removed),
&ctx);
if (timeout_ms > 0)
g_timeout_add(timeout_ms, on_sync_timeout, &ctx);
@ -564,7 +570,7 @@ mock_tree_settle(MockTree *root, FuPlugin *plugin)
.loop = mainloop,
};
id = g_signal_connect(plugin,
id = g_signal_connect(FU_PLUGIN(plugin),
"device-added",
G_CALLBACK(mock_tree_plugin_device_added),
&ctx);
@ -784,7 +790,7 @@ mock_tree_prepare_for_update(MockTree *node,
ctx->version = g_strdup(version);
ctx->data = g_bytes_ref(fw_data);
g_signal_connect(monitor, "changed", G_CALLBACK(udev_file_changed_cb), ctx);
g_signal_connect(G_FILE_MONITOR(monitor), "changed", G_CALLBACK(udev_file_changed_cb), ctx);
return ctx;
}
@ -952,7 +958,10 @@ test_set_up(ThunderboltTest *tt, gconstpointer params)
tt->udev_client = g_udev_client_new(udev_subsystems);
g_assert_nonnull(tt->udev_client);
g_signal_connect(tt->udev_client, "uevent", G_CALLBACK(fu_thunderbolt_gudev_uevent_cb), tt);
g_signal_connect(G_UDEV_CLIENT(tt->udev_client),
"uevent",
G_CALLBACK(fu_thunderbolt_gudev_uevent_cb),
tt);
if (flags & TEST_ATTACH) {
g_assert_true(flags & TEST_INITIALIZE_TREE);

2
plugins/uefi-capsule/fu-plugin-uefi-capsule.c
View File

@ -773,7 +773,7 @@ fu_plugin_uefi_capsule_coldplug(FuPlugin *plugin, GError **error)
fu_plugin_uefi_capsule_load_config(plugin, FU_DEVICE(dev));
/* watch in case we set needs-reboot in the engine */
g_signal_connect(dev,
g_signal_connect(FU_DEVICE(dev),
"notify::update-state",
G_CALLBACK(fu_plugin_uefi_update_state_notify_cb),
plugin);

4
plugins/upower/fu-plugin-upower.c
View File

@ -141,11 +141,11 @@ fu_plugin_upower_startup(FuPlugin *plugin, GError **error)
g_dbus_proxy_get_name(data->proxy));
return FALSE;
}
g_signal_connect(data->proxy,
g_signal_connect(G_DBUS_PROXY(data->proxy),
"g-properties-changed",
G_CALLBACK(fu_plugin_upower_proxy_changed_cb),
plugin);
g_signal_connect(data->proxy_manager,
g_signal_connect(G_DBUS_PROXY(data->proxy_manager),
"g-properties-changed",
G_CALLBACK(fu_plugin_upower_proxy_changed_cb),
plugin);

2
plugins/usi-dock/fu-usi-dock-dmc-device.c
View File

@ -43,7 +43,7 @@ fu_usi_dock_dmc_device_parent_notify_cb(FuDevice *device, GParamSpec *pspec, gpo
static void
fu_usi_dock_dmc_device_init(FuUsiDockDmcDevice *self)
{
g_signal_connect(self,
g_signal_connect(FU_DEVICE(self),
"notify::parent",
G_CALLBACK(fu_usi_dock_dmc_device_parent_notify_cb),
NULL);

5
plugins/vli/fu-vli-pd-device.c
View File

@ -835,7 +835,10 @@ fu_vli_pd_device_init(FuVliPdDevice *self)
"has-i2c-ps186");
/* connect up attach or detach vfuncs when kind is known */
g_signal_connect(self, "notify::kind", G_CALLBACK(fu_vli_pd_device_kind_changed_cb), NULL);
g_signal_connect(FU_VLI_DEVICE(self),
"notify::kind",
G_CALLBACK(fu_vli_pd_device_kind_changed_cb),
NULL);
}
static void

6
src/fu-bluez-backend.c
View File

@ -86,7 +86,7 @@ fu_bluez_backend_object_added(FuBluezBackend *self, GDBusObject *object)
iface = g_dbus_object_get_interface(object, "org.bluez.Device1");
if (iface == NULL)
return;
g_signal_connect(iface,
g_signal_connect(G_DBUS_INTERFACE(iface),
"g-properties-changed",
G_CALLBACK(fu_bluez_backend_object_properties_changed_cb),
self);
@ -184,11 +184,11 @@ fu_bluez_backend_setup(FuBackend *backend, GError **error)
return FALSE;
self->object_manager = g_steal_pointer(&helper->object_manager);
g_signal_connect(self->object_manager,
g_signal_connect(G_DBUS_OBJECT_MANAGER(self->object_manager),
"object-added",
G_CALLBACK(fu_bluez_backend_object_added_cb),
self);
g_signal_connect(self->object_manager,
g_signal_connect(G_DBUS_OBJECT_MANAGER(self->object_manager),
"object-removed",
G_CALLBACK(fu_bluez_backend_object_removed_cb),
self);

5
src/fu-config.c
View File

@ -261,7 +261,10 @@ fu_config_load(FuConfig *self, GError **error)
self->monitor = g_file_monitor(file, G_FILE_MONITOR_NONE, NULL, error);
if (self->monitor == NULL)
return FALSE;
g_signal_connect(self->monitor, "changed", G_CALLBACK(fu_config_monitor_changed_cb), self);
g_signal_connect(G_FILE_MONITOR(self->monitor),
"changed",
G_CALLBACK(fu_config_monitor_changed_cb),
self);
/* success */
return TRUE;

64
src/fu-engine.c
View File

@ -230,24 +230,30 @@ fu_engine_watch_device(FuEngine *self, FuDevice *device)
g_signal_handlers_disconnect_by_func(device_old, fu_engine_history_notify_cb, self);
g_signal_handlers_disconnect_by_func(device_old, fu_engine_device_request_cb, self);
}
g_signal_connect(device, "notify::flags", G_CALLBACK(fu_engine_generic_notify_cb), self);
g_signal_connect(device,
g_signal_connect(FU_DEVICE(device),
"notify::flags",
G_CALLBACK(fu_engine_generic_notify_cb),
self);
g_signal_connect(FU_DEVICE(device),
"notify::update-message",
G_CALLBACK(fu_engine_generic_notify_cb),
self);
g_signal_connect(device,
g_signal_connect(FU_DEVICE(device),
"notify::update-image",
G_CALLBACK(fu_engine_generic_notify_cb),
self);
g_signal_connect(device,
g_signal_connect(FU_DEVICE(device),
"notify::update-state",
G_CALLBACK(fu_engine_history_notify_cb),
self);
g_signal_connect(device,
g_signal_connect(FU_DEVICE(device),
"notify::update-error",
G_CALLBACK(fu_engine_history_notify_cb),
self);
g_signal_connect(device, "request", G_CALLBACK(fu_engine_device_request_cb), self);
g_signal_connect(FU_DEVICE(device),
"request",
G_CALLBACK(fu_engine_device_request_cb),
self);
}
static void
@ -6357,27 +6363,27 @@ fu_engine_load_plugins(FuEngine *self, GError **error)
}
/* watch for changes */
g_signal_connect(plugin,
g_signal_connect(FU_PLUGIN(plugin),
"device-added",
G_CALLBACK(fu_engine_plugin_device_added_cb),
self);
g_signal_connect(plugin,
g_signal_connect(FU_PLUGIN(plugin),
"device-removed",
G_CALLBACK(fu_engine_plugin_device_removed_cb),
self);
g_signal_connect(plugin,
g_signal_connect(FU_PLUGIN(plugin),
"device-register",
G_CALLBACK(fu_engine_plugin_device_register_cb),
self);
g_signal_connect(plugin,
g_signal_connect(FU_PLUGIN(plugin),
"check-supported",
G_CALLBACK(fu_engine_plugin_check_supported_cb),
self);
g_signal_connect(plugin,
g_signal_connect(FU_PLUGIN(plugin),
"rules-changed",
G_CALLBACK(fu_engine_plugin_rules_changed_cb),
self);
g_signal_connect(plugin,
g_signal_connect(FU_PLUGIN(plugin),
"config-changed",
G_CALLBACK(fu_engine_plugin_config_changed_cb),
self);
@ -6981,12 +6987,15 @@ fu_engine_load(FuEngine *self, FuEngineLoadFlags flags, GError **error)
fu_engine_context_set_battery_threshold(self->ctx);
/* watch the device list for updates and proxy */
g_signal_connect(self->device_list, "added", G_CALLBACK(fu_engine_device_added_cb), self);
g_signal_connect(self->device_list,
g_signal_connect(FU_DEVICE_LIST(self->device_list),
"added",
G_CALLBACK(fu_engine_device_added_cb),
self);
g_signal_connect(FU_DEVICE_LIST(self->device_list),
"removed",
G_CALLBACK(fu_engine_device_removed_cb),
self);
g_signal_connect(self->device_list,
g_signal_connect(FU_DEVICE_LIST(self->device_list),
"changed",
G_CALLBACK(fu_engine_device_changed_cb),
self);
@ -7004,15 +7013,15 @@ fu_engine_load(FuEngine *self, FuEngineLoadFlags flags, GError **error)
g_autoptr(GError) error_backend = NULL;
if (!fu_backend_get_enabled(backend))
continue;
g_signal_connect(backend,
g_signal_connect(FU_BACKEND(backend),
"device-added",
G_CALLBACK(fu_engine_backend_device_added_cb),
self);
g_signal_connect(backend,
g_signal_connect(FU_BACKEND(backend),
"device-removed",
G_CALLBACK(fu_engine_backend_device_removed_cb),
self);
g_signal_connect(backend,
g_signal_connect(FU_BACKEND(backend),
"device-changed",
G_CALLBACK(fu_engine_backend_device_changed_cb),
self);
@ -7211,34 +7220,37 @@ fu_engine_init(FuEngine *self)
fu_context_set_runtime_versions(self->ctx, self->runtime_versions);
fu_context_set_compile_versions(self->ctx, self->compile_versions);
g_signal_connect(self->ctx,
g_signal_connect(FU_CONTEXT(self->ctx),
"security-changed",
G_CALLBACK(fu_engine_context_security_changed_cb),
self);
g_signal_connect(self->ctx,
g_signal_connect(FU_CONTEXT(self->ctx),
"notify::battery-state",
G_CALLBACK(fu_engine_context_battery_changed_cb),
self);
g_signal_connect(self->ctx,
g_signal_connect(FU_CONTEXT(self->ctx),
"notify::lid-state",
G_CALLBACK(fu_engine_context_battery_changed_cb),
self);
g_signal_connect(self->ctx,
g_signal_connect(FU_CONTEXT(self->ctx),
"notify::battery-level",
G_CALLBACK(fu_engine_context_battery_changed_cb),
self);
g_signal_connect(self->ctx,
g_signal_connect(FU_CONTEXT(self->ctx),
"notify::battery-threshold",
G_CALLBACK(fu_engine_context_battery_changed_cb),
self);
g_signal_connect(self->config, "changed", G_CALLBACK(fu_engine_config_changed_cb), self);
g_signal_connect(self->remote_list,
g_signal_connect(FU_CONFIG(self->config),
"changed",
G_CALLBACK(fu_engine_config_changed_cb),
self);
g_signal_connect(FU_REMOTE_LIST(self->remote_list),
"changed",
G_CALLBACK(fu_engine_remote_list_changed_cb),
self);
g_signal_connect(self->idle,
g_signal_connect(FU_IDLE(self->idle),
"notify::status",
G_CALLBACK(fu_engine_idle_status_notify_cb),
self);

38
src/fu-main.c
View File

@ -635,11 +635,11 @@ fu_main_authorize_activate_cb(GObject *source, GAsyncResult *res, gpointer user_
/* progress */
fu_progress_set_profile(progress, g_getenv("FWUPD_VERBOSE") != NULL);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"percentage-changed",
G_CALLBACK(fu_main_progress_percentage_changed_cb),
helper->priv);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"status-changed",
G_CALLBACK(fu_main_progress_status_changed_cb),
helper->priv);
@ -679,11 +679,11 @@ fu_main_authorize_verify_update_cb(GObject *source, GAsyncResult *res, gpointer
/* progress */
fu_progress_set_profile(progress, g_getenv("FWUPD_VERBOSE") != NULL);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"percentage-changed",
G_CALLBACK(fu_main_progress_percentage_changed_cb),
helper->priv);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"status-changed",
G_CALLBACK(fu_main_progress_status_changed_cb),
helper->priv);
@ -788,11 +788,11 @@ fu_main_authorize_install_queue(FuMainAuthHelper *helper_ref)
/* all authenticated, so install all the things */
fu_progress_set_profile(progress, g_getenv("FWUPD_VERBOSE") != NULL);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"percentage-changed",
G_CALLBACK(fu_main_progress_percentage_changed_cb),
helper->priv);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"status-changed",
G_CALLBACK(fu_main_progress_status_changed_cb),
helper->priv);
@ -1600,11 +1600,11 @@ fu_main_daemon_method_call(GDBusConnection *connection,
/* progress */
fu_progress_set_profile(progress, g_getenv("FWUPD_VERBOSE") != NULL);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"percentage-changed",
G_CALLBACK(fu_main_progress_percentage_changed_cb),
priv);
g_signal_connect(progress,
g_signal_connect(FU_PROGRESS(progress),
"status-changed",
G_CALLBACK(fu_main_progress_status_changed_cb),
priv);
@ -2085,24 +2085,27 @@ main(int argc, char *argv[])
/* load engine */
priv->engine = fu_engine_new(FU_APP_FLAGS_NONE);
g_signal_connect(priv->engine, "changed", G_CALLBACK(fu_main_engine_changed_cb), priv);
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"changed",
G_CALLBACK(fu_main_engine_changed_cb),
priv);
g_signal_connect(FU_ENGINE(priv->engine),
"device-added",
G_CALLBACK(fu_main_engine_device_added_cb),
priv);
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"device-removed",
G_CALLBACK(fu_main_engine_device_removed_cb),
priv);
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"device-changed",
G_CALLBACK(fu_main_engine_device_changed_cb),
priv);
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"device-request",
G_CALLBACK(fu_main_engine_device_request_cb),
priv);
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"status-changed",
G_CALLBACK(fu_main_engine_status_changed_cb),
priv);
@ -2118,12 +2121,15 @@ main(int argc, char *argv[])
/* restart the daemon if the binary gets replaced */
priv->argv0_monitor = g_file_monitor_file(argv0_file, G_FILE_MONITOR_NONE, NULL, &error);
g_signal_connect(priv->argv0_monitor, "changed", G_CALLBACK(fu_main_argv_changed_cb), priv);
g_signal_connect(G_FILE_MONITOR(priv->argv0_monitor),
"changed",
G_CALLBACK(fu_main_argv_changed_cb),
priv);
#if GLIB_CHECK_VERSION(2, 63, 3)
/* shut down on low memory event as we can just rescan hardware */
priv->memory_monitor = g_memory_monitor_dup_default();
g_signal_connect(G_OBJECT(priv->memory_monitor),
g_signal_connect(G_MEMORY_MONITOR(priv->memory_monitor),
"low-memory-warning",
G_CALLBACK(fu_main_memory_monitor_warning_cb),
priv);

2
src/fu-offline.c
View File

@ -191,7 +191,7 @@ main(int argc, char *argv[])
/* connect to the daemon */
client = fwupd_client_new();
g_signal_connect(client,
g_signal_connect(FWUPD_CLIENT(client),
"notify::percentage",
G_CALLBACK(fu_offline_client_notify_cb),
priv);

2
src/fu-plugin-list.c
View File

@ -94,7 +94,7 @@ fu_plugin_list_add(FuPluginList *self, FuPlugin *plugin)
g_hash_table_insert(self->plugins_hash,
g_strdup(fu_plugin_get_name(plugin)),
g_object_ref(plugin));
g_signal_connect(plugin,
g_signal_connect(FU_PLUGIN(plugin),
"rules-changed",
G_CALLBACK(fu_plugin_list_rules_changed_cb),
self);

5
src/fu-remote-list.c
View File

@ -123,7 +123,10 @@ fu_remote_list_add_inotify(FuRemoteList *self, const gchar *filename, GError **e
fu_remote_list_fixup_inotify_error(error);
return FALSE;
}
g_signal_connect(monitor, "changed", G_CALLBACK(fu_remote_list_monitor_changed_cb), self);
g_signal_connect(G_FILE_MONITOR(monitor),
"changed",
G_CALLBACK(fu_remote_list_monitor_changed_cb),
self);
g_ptr_array_add(self->monitors, monitor);
return TRUE;
}

71
src/fu-self-test.c
View File

@ -2318,9 +2318,18 @@ fu_device_list_delay_func(gconstpointer user_data)
guint changed_cnt = 0;
guint removed_cnt = 0;
g_signal_connect(device_list, "added", G_CALLBACK(_device_list_count_cb), &added_cnt);
g_signal_connect(device_list, "removed", G_CALLBACK(_device_list_count_cb), &removed_cnt);
g_signal_connect(device_list, "changed", G_CALLBACK(_device_list_count_cb), &changed_cnt);
g_signal_connect(FU_DEVICE_LIST(device_list),
"added",
G_CALLBACK(_device_list_count_cb),
&added_cnt);
g_signal_connect(FU_DEVICE_LIST(device_list),
"removed",
G_CALLBACK(_device_list_count_cb),
&removed_cnt);
g_signal_connect(FU_DEVICE_LIST(device_list),
"changed",
G_CALLBACK(_device_list_count_cb),
&changed_cnt);
/* add one device */
fu_device_set_id(device1, "device1");
@ -2534,9 +2543,18 @@ fu_device_list_compatible_func(gconstpointer user_data)
guint changed_cnt = 0;
guint removed_cnt = 0;
g_signal_connect(device_list, "added", G_CALLBACK(_device_list_count_cb), &added_cnt);
g_signal_connect(device_list, "removed", G_CALLBACK(_device_list_count_cb), &removed_cnt);
g_signal_connect(device_list, "changed", G_CALLBACK(_device_list_count_cb), &changed_cnt);
g_signal_connect(FU_DEVICE_LIST(device_list),
"added",
G_CALLBACK(_device_list_count_cb),
&added_cnt);
g_signal_connect(FU_DEVICE_LIST(device_list),
"removed",
G_CALLBACK(_device_list_count_cb),
&removed_cnt);
g_signal_connect(FU_DEVICE_LIST(device_list),
"changed",
G_CALLBACK(_device_list_count_cb),
&changed_cnt);
/* add one device in runtime mode */
fu_device_set_id(device1, "device1");
@ -2604,9 +2622,18 @@ fu_device_list_remove_chain_func(gconstpointer user_data)
guint changed_cnt = 0;
guint removed_cnt = 0;
g_signal_connect(device_list, "added", G_CALLBACK(_device_list_count_cb), &added_cnt);
g_signal_connect(device_list, "removed", G_CALLBACK(_device_list_count_cb), &removed_cnt);
g_signal_connect(device_list, "changed", G_CALLBACK(_device_list_count_cb), &changed_cnt);
g_signal_connect(FU_DEVICE_LIST(device_list),
"added",
G_CALLBACK(_device_list_count_cb),
&added_cnt);
g_signal_connect(FU_DEVICE_LIST(device_list),
"removed",
G_CALLBACK(_device_list_count_cb),
&removed_cnt);
g_signal_connect(FU_DEVICE_LIST(device_list),
"changed",
G_CALLBACK(_device_list_count_cb),
&changed_cnt);
/* add child */
fu_device_set_id(device_child, "child");
@ -2649,9 +2676,18 @@ fu_device_list_func(gconstpointer user_data)
guint changed_cnt = 0;
guint removed_cnt = 0;
g_signal_connect(device_list, "added", G_CALLBACK(_device_list_count_cb), &added_cnt);
g_signal_connect(device_list, "removed", G_CALLBACK(_device_list_count_cb), &removed_cnt);
g_signal_connect(device_list, "changed", G_CALLBACK(_device_list_count_cb), &changed_cnt);
g_signal_connect(FU_DEVICE_LIST(device_list),
"added",
G_CALLBACK(_device_list_count_cb),
&added_cnt);
g_signal_connect(FU_DEVICE_LIST(device_list),
"removed",
G_CALLBACK(_device_list_count_cb),
&removed_cnt);
g_signal_connect(FU_DEVICE_LIST(device_list),
"changed",
G_CALLBACK(_device_list_count_cb),
&changed_cnt);
/* add both */
fu_device_set_id(device1, "device1");
@ -2872,11 +2908,11 @@ fu_plugin_module_func(gconstpointer user_data)
ret = fu_plugin_runner_startup(self->plugin, &error);
g_assert_no_error(error);
g_assert_true(ret);
g_signal_connect(self->plugin,
g_signal_connect(FU_PLUGIN(self->plugin),
"device-added",
G_CALLBACK(_plugin_device_added_cb),
&device);
g_signal_connect(self->plugin,
g_signal_connect(FU_PLUGIN(self->plugin),
"device-register",
G_CALLBACK(_plugin_device_register_cb),
&device);
@ -2901,7 +2937,10 @@ fu_plugin_module_func(gconstpointer user_data)
return;
#endif
/* schedule an offline update */
g_signal_connect(progress, "status-changed", G_CALLBACK(_plugin_status_changed_cb), &cnt);
g_signal_connect(FU_PROGRESS(progress),
"status-changed",
G_CALLBACK(_plugin_status_changed_cb),
&cnt);
mapped_file_fn =
g_test_build_filename(G_TEST_DIST, "tests", "colorhug", "firmware.bin", NULL);
mapped_file = g_mapped_file_new(mapped_file_fn, FALSE, &error);
@ -3264,7 +3303,7 @@ fu_plugin_composite_func(gconstpointer user_data)
g_assert_no_error(error);
g_assert_true(ret);
devices = g_ptr_array_new_with_free_func((GDestroyNotify)g_object_unref);
g_signal_connect(self->plugin,
g_signal_connect(FU_PLUGIN(self->plugin),
"device-added",
G_CALLBACK(_plugin_composite_device_added_cb),
devices);

45
src/fu-tool.c
View File

@ -876,7 +876,7 @@ fu_util_install_blob(FuUtilPrivate *priv, gchar **values, GError **error)
}
priv->current_operation = FU_UTIL_OPERATION_INSTALL;
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"device-changed",
G_CALLBACK(fu_util_update_device_changed_cb),
priv);
@ -1014,7 +1014,7 @@ fu_util_firmware_dump(FuUtilPrivate *priv, gchar **values, GError **error)
return FALSE;
}
priv->current_operation = FU_UTIL_OPERATION_READ;
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"device-changed",
G_CALLBACK(fu_util_update_device_changed_cb),
priv);
@ -1212,7 +1212,7 @@ fu_util_install(FuUtilPrivate *priv, gchar **values, GError **error)
}
priv->current_operation = FU_UTIL_OPERATION_INSTALL;
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"device-changed",
G_CALLBACK(fu_util_update_device_changed_cb),
priv);
@ -1427,7 +1427,7 @@ fu_util_update(FuUtilPrivate *priv, gchar **values, GError **error)
return FALSE;
priv->current_operation = FU_UTIL_OPERATION_UPDATE;
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"device-changed",
G_CALLBACK(fu_util_update_device_changed_cb),
priv);
@ -1504,7 +1504,7 @@ fu_util_reinstall(FuUtilPrivate *priv, gchar **values, GError **error)
/* update the console if composite devices are also updated */
priv->current_operation = FU_UTIL_OPERATION_INSTALL;
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"device-changed",
G_CALLBACK(fu_util_update_device_changed_cb),
priv);
@ -1965,11 +1965,23 @@ fu_util_monitor(FuUtilPrivate *priv, gchar **values, GError **error)
return FALSE;
/* watch for any hotplugged device */
g_signal_connect(client, "changed", G_CALLBACK(fu_util_changed_cb), priv);
g_signal_connect(client, "device-added", G_CALLBACK(fu_util_device_added_cb), priv);
g_signal_connect(client, "device-removed", G_CALLBACK(fu_util_device_removed_cb), priv);
g_signal_connect(client, "device-changed", G_CALLBACK(fu_util_device_changed_cb), priv);
g_signal_connect(priv->cancellable, "cancelled", G_CALLBACK(fu_util_cancelled_cb), priv);
g_signal_connect(FWUPD_CLIENT(client), "changed", G_CALLBACK(fu_util_changed_cb), priv);
g_signal_connect(FWUPD_CLIENT(client),
"device-added",
G_CALLBACK(fu_util_device_added_cb),
priv);
g_signal_connect(FWUPD_CLIENT(client),
"device-removed",
G_CALLBACK(fu_util_device_removed_cb),
priv);
g_signal_connect(FWUPD_CLIENT(client),
"device-changed",
G_CALLBACK(fu_util_device_changed_cb),
priv);
g_signal_connect(G_CANCELLABLE(priv->cancellable),
"cancelled",
G_CALLBACK(fu_util_cancelled_cb),
priv);
g_main_loop_run(priv->loop);
return TRUE;
}
@ -2917,7 +2929,7 @@ fu_util_switch_branch(FuUtilPrivate *priv, gchar **values, GError **error)
/* update the console if composite devices are also updated */
priv->current_operation = FU_UTIL_OPERATION_INSTALL;
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"device-changed",
G_CALLBACK(fu_util_update_device_changed_cb),
priv);
@ -3406,7 +3418,10 @@ main(int argc, char *argv[])
/* do stuff on ctrl+c */
priv->cancellable = g_cancellable_new();
fu_util_setup_signal_handlers(priv);
g_signal_connect(priv->cancellable, "cancelled", G_CALLBACK(fu_util_cancelled_cb), priv);
g_signal_connect(G_CANCELLABLE(priv->cancellable),
"cancelled",
G_CALLBACK(fu_util_cancelled_cb),
priv);
/* sort by command name */
fu_util_cmd_array_sort(cmd_array);
@ -3489,15 +3504,15 @@ main(int argc, char *argv[])
/* load engine */
priv->engine = fu_engine_new(FU_APP_FLAGS_NO_IDLE_SOURCES);
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"device-added",
G_CALLBACK(fu_main_engine_device_added_cb),
priv);
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"device-removed",
G_CALLBACK(fu_main_engine_device_removed_cb),
priv);
g_signal_connect(priv->engine,
g_signal_connect(FU_ENGINE(priv->engine),
"status-changed",
G_CALLBACK(fu_main_engine_status_changed_cb),
priv);

2
src/fu-udev-backend.c
View File

@ -142,7 +142,7 @@ fu_udev_backend_coldplug(FuBackend *backend, GError **error)
subsystems[i] = g_strdup(subsystem);
}
self->gudev_client = g_udev_client_new((const gchar *const *)subsystems);
g_signal_connect(self->gudev_client,
g_signal_connect(G_UDEV_CLIENT(self->gudev_client),
"uevent",
G_CALLBACK(fu_udev_backend_uevent_cb),
self);

4
src/fu-usb-backend.c
View File

@ -61,11 +61,11 @@ fu_usb_backend_setup(FuBackend *backend, GError **error)
return FALSE;
}
g_object_weak_ref(G_OBJECT(self->usb_ctx), fu_usb_backend_context_finalized_cb, self);
g_signal_connect(self->usb_ctx,
g_signal_connect(G_USB_CONTEXT(self->usb_ctx),
"device-added",
G_CALLBACK(fu_usb_backend_device_added_cb),
self);
g_signal_connect(self->usb_ctx,
g_signal_connect(G_USB_CONTEXT(self->usb_ctx),
"device-removed",
G_CALLBACK(fu_usb_backend_device_removed_cb),
self);

34
src/fu-util.c
View File

@ -989,7 +989,7 @@ fu_util_device_test(FuUtilPrivate *priv, gchar **values, GError **error)
.name = "Unknown"};
/* required for interactive devices */
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-request",
G_CALLBACK(fu_util_update_device_request_cb),
priv);
@ -1101,11 +1101,11 @@ fu_util_install(FuUtilPrivate *priv, gchar **values, GError **error)
}
priv->current_operation = FU_UTIL_OPERATION_INSTALL;
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-changed",
G_CALLBACK(fu_util_update_device_changed_cb),
priv);
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-request",
G_CALLBACK(fu_util_update_device_request_cb),
priv);
@ -2316,11 +2316,11 @@ fu_util_update_all(FuUtilPrivate *priv, GError **error)
if (devices == NULL)
return FALSE;
priv->current_operation = FU_UTIL_OPERATION_UPDATE;
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-changed",
G_CALLBACK(fu_util_update_device_changed_cb),
priv);
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-request",
G_CALLBACK(fu_util_update_device_request_cb),
priv);
@ -2414,11 +2414,11 @@ fu_util_update_by_id(FuUtilPrivate *priv, const gchar *device_id, GError **error
/* get devices from daemon */
priv->current_operation = FU_UTIL_OPERATION_UPDATE;
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-changed",
G_CALLBACK(fu_util_update_device_changed_cb),
priv);
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-request",
G_CALLBACK(fu_util_update_device_request_cb),
priv);
@ -2622,11 +2622,11 @@ fu_util_downgrade(FuUtilPrivate *priv, gchar **values, GError **error)
/* update the console if composite devices are also updated */
priv->current_operation = FU_UTIL_OPERATION_DOWNGRADE;
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-changed",
G_CALLBACK(fu_util_update_device_changed_cb),
priv);
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-request",
G_CALLBACK(fu_util_update_device_request_cb),
priv);
@ -2688,11 +2688,11 @@ fu_util_reinstall(FuUtilPrivate *priv, gchar **values, GError **error)
/* update the console if composite devices are also updated */
priv->current_operation = FU_UTIL_OPERATION_INSTALL;
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-changed",
G_CALLBACK(fu_util_update_device_changed_cb),
priv);
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-request",
G_CALLBACK(fu_util_update_device_request_cb),
priv);
@ -2816,11 +2816,11 @@ fu_util_switch_branch(FuUtilPrivate *priv, gchar **values, GError **error)
/* update the console if composite devices are also updated */
priv->current_operation = FU_UTIL_OPERATION_INSTALL;
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-changed",
G_CALLBACK(fu_util_update_device_changed_cb),
priv);
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-request",
G_CALLBACK(fu_util_update_device_request_cb),
priv);
@ -3254,11 +3254,11 @@ fu_util_sync_bkc(FuUtilPrivate *priv, gchar **values, GError **error)
/* update the console if composite devices are also updated */
priv->current_operation = FU_UTIL_OPERATION_INSTALL;
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-changed",
G_CALLBACK(fu_util_update_device_changed_cb),
priv);
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"device-request",
G_CALLBACK(fu_util_update_device_request_cb),
priv);
@ -4272,11 +4272,11 @@ main(int argc, char *argv[])
/* connect to the daemon */
priv->client = fwupd_client_new();
fwupd_client_set_main_context(priv->client, priv->main_ctx);
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"notify::percentage",
G_CALLBACK(fu_util_client_notify_cb),
priv);
g_signal_connect(priv->client,
g_signal_connect(FWUPD_CLIENT(priv->client),
"notify::status",
G_CALLBACK(fu_util_client_notify_cb),
priv);