fdo-mirrors/upower
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/upower/upower.git synced 2025-12-20 06:40:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'get-devices-unref' into 'master'

Browse source 
lib: Add a new version of up_client_get_devices which unrefs contents

See merge request upower/upower!1
This commit is contained in:
Richard Hughes 2018-06-05 13:02:27 +00:00
commit 49af045fa9
3 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
libupower-glib/up-client.c
View file

@ -80,14 +80,35 @@ G_DEFINE_TYPE_WITH_CODE (UpClient, up_client, G_TYPE_OBJECT,
* up_client_get_devices: * up_client_get_devices:
* @client: a #UpClient instance. * @client: a #UpClient instance.
* *
* Get a copy of the device objects. * Get a copy of the device objects. This function does not set the free
* function for the #GPtrArray so you need use g_object_unref on all
* elements when you are finished with the array.
* *
* Return value: (element-type UpDevice) (transfer full): an array of #UpDevice objects, free with g_ptr_array_unref() * Return value: (element-type UpDevice) (transfer full): an array of #UpDevice objects, free with g_ptr_array_unref()
* *
* Since: 0.9.0 * Since: 0.9.0
* Deprecated: 0.99.8
**/ **/
GPtrArray * GPtrArray *
up_client_get_devices (UpClient *client) up_client_get_devices (UpClient *client)
{
GPtrArray *array = up_client_get_devices2 (client);
g_ptr_array_set_free_func (array, NULL);
return array;
}
/**
* up_client_get_devices2:
* @client: a #UpClient instance.
*
* Get a copy of the device objects.
*
* Return value: (element-type UpDevice) (transfer full): an array of #UpDevice objects, free with g_ptr_array_unref()
*
* Since: 0.99.8
**/
GPtrArray *
up_client_get_devices2 (UpClient *client)
{ {
GError *error = NULL; GError *error = NULL;
char **devices; char **devices;
@ -105,7 +126,7 @@ up_client_get_devices (UpClient *client)
return NULL; return NULL;
} }
array = g_ptr_array_new (); array = g_ptr_array_new_with_free_func ((GDestroyNotify) g_object_unref);
for (i = 0; devices[i] != NULL; i++) { for (i = 0; devices[i] != NULL; i++) {
UpDevice *device; UpDevice *device;

3
libupower-glib/up-client.h
View file

@ -79,7 +79,8 @@ UpDevice * up_client_get_display_device (UpClient *client);
char * up_client_get_critical_action (UpClient *client); char * up_client_get_critical_action (UpClient *client);
/* accessors */ /* accessors */
GPtrArray *up_client_get_devices (UpClient *client); GPtrArray *up_client_get_devices (UpClient *client) G_DEPRECATED_FOR(up_client_get_devices2);
GPtrArray *up_client_get_devices2 (UpClient *client);
const gchar *up_client_get_daemon_version (UpClient *client); const gchar *up_client_get_daemon_version (UpClient *client);
gboolean up_client_get_lid_is_closed (UpClient *client); gboolean up_client_get_lid_is_closed (UpClient *client);
gboolean up_client_get_lid_is_present (UpClient *client); gboolean up_client_get_lid_is_present (UpClient *client);

4
tools/up-tool.c
View file

@ -173,7 +173,7 @@ up_tool_do_monitor (UpClient *client)
g_signal_connect (client, "device-removed", G_CALLBACK (up_tool_device_removed_cb), NULL); g_signal_connect (client, "device-removed", G_CALLBACK (up_tool_device_removed_cb), NULL);
g_signal_connect (client, "notify", G_CALLBACK (up_tool_changed_cb), NULL); g_signal_connect (client, "notify", G_CALLBACK (up_tool_changed_cb), NULL);
devices = up_client_get_devices (client); devices = up_client_get_devices2 (client);
for (i=0; i < devices->len; i++) { for (i=0; i < devices->len; i++) {
UpDevice *device; UpDevice *device;
device = g_ptr_array_index (devices, i); device = g_ptr_array_index (devices, i);
@ -314,7 +314,7 @@ main (int argc, char **argv)
if (opt_enumerate || opt_dump) { if (opt_enumerate || opt_dump) {
GPtrArray *devices; GPtrArray *devices;
devices = up_client_get_devices (client); devices = up_client_get_devices2 (client);
for (i=0; i < devices->len; i++) { for (i=0; i < devices->len; i++) {
device = (UpDevice*) g_ptr_array_index (devices, i); device = (UpDevice*) g_ptr_array_index (devices, i);
if (opt_enumerate) { if (opt_enumerate) {