luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-01 02:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1636-gtask-getters' into 'master'

Browse Source 
gtask: Ensure to return 1 or 0 from getters rather than truthy ints

Closes #1636

See merge request GNOME/glib!570
This commit is contained in:
Rico Tzschichholz 2019-01-05 09:08:22 +00:00
commit 245279e834
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gio/gtask.c
View File

@ -1132,7 +1132,8 @@ g_task_get_check_cancellable (GTask *task)
{ {
g_return_val_if_fail (G_IS_TASK (task), FALSE); g_return_val_if_fail (G_IS_TASK (task), FALSE);
return task->check_cancellable; /* Convert from a bit field to a boolean. */
return task->check_cancellable ? TRUE : FALSE;
} }
/** /**
@ -1149,7 +1150,8 @@ g_task_get_return_on_cancel (GTask *task)
{ {
g_return_val_if_fail (G_IS_TASK (task), FALSE); g_return_val_if_fail (G_IS_TASK (task), FALSE);
return task->return_on_cancel; /* Convert from a bit field to a boolean. */
return task->return_on_cancel ? TRUE : FALSE;
} }
/** /**
@ -1952,7 +1954,8 @@ g_task_get_completed (GTask *task)
{ {
g_return_val_if_fail (G_IS_TASK (task), FALSE); g_return_val_if_fail (G_IS_TASK (task), FALSE);
return task->completed; /* Convert from a bit field to a boolean. */
return task->completed ? TRUE : FALSE;
} }
/** /**
@ -2055,7 +2058,7 @@ g_task_get_property (GObject *object,
switch ((GTaskProperty) prop_id) switch ((GTaskProperty) prop_id)
{ {
case PROP_COMPLETED: case PROP_COMPLETED:
g_value_set_boolean (value, task->completed); g_value_set_boolean (value, g_task_get_completed (task));
break; break;
} }
} }