shell: Fix return values in precondition guards
Make sure values returned via `g_return_val_if_fail()` are of the expected type. Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3620>
This commit is contained in:
parent
73928c9b29
commit
51b5358b71
@ -854,7 +854,7 @@ shell_blur_effect_set_radius (ShellBlurEffect *self,
|
|||||||
float
|
float
|
||||||
shell_blur_effect_get_brightness (ShellBlurEffect *self)
|
shell_blur_effect_get_brightness (ShellBlurEffect *self)
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (SHELL_IS_BLUR_EFFECT (self), FALSE);
|
g_return_val_if_fail (SHELL_IS_BLUR_EFFECT (self), -1);
|
||||||
|
|
||||||
return self->brightness;
|
return self->brightness;
|
||||||
}
|
}
|
||||||
@ -880,7 +880,7 @@ shell_blur_effect_set_brightness (ShellBlurEffect *self,
|
|||||||
ShellBlurMode
|
ShellBlurMode
|
||||||
shell_blur_effect_get_mode (ShellBlurEffect *self)
|
shell_blur_effect_get_mode (ShellBlurEffect *self)
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (SHELL_IS_BLUR_EFFECT (self), -1);
|
g_return_val_if_fail (SHELL_IS_BLUR_EFFECT (self), SHELL_BLUR_MODE_ACTOR);
|
||||||
|
|
||||||
return self->mode;
|
return self->mode;
|
||||||
}
|
}
|
||||||
|
@ -868,11 +868,11 @@ shell_screenshot_screenshot_stage_to_content_finish (ShellScreenshot *screensh
|
|||||||
{
|
{
|
||||||
ClutterContent *content;
|
ClutterContent *content;
|
||||||
|
|
||||||
g_return_val_if_fail (SHELL_IS_SCREENSHOT (screenshot), FALSE);
|
g_return_val_if_fail (SHELL_IS_SCREENSHOT (screenshot), NULL);
|
||||||
g_return_val_if_fail (G_IS_TASK (result), FALSE);
|
g_return_val_if_fail (G_IS_TASK (result), NULL);
|
||||||
g_return_val_if_fail (g_async_result_is_tagged (result,
|
g_return_val_if_fail (g_async_result_is_tagged (result,
|
||||||
shell_screenshot_screenshot_stage_to_content),
|
shell_screenshot_screenshot_stage_to_content),
|
||||||
FALSE);
|
NULL);
|
||||||
|
|
||||||
content = g_task_propagate_pointer (G_TASK (result), error);
|
content = g_task_propagate_pointer (G_TASK (result), error);
|
||||||
if (!content)
|
if (!content)
|
||||||
@ -1344,10 +1344,10 @@ GdkPixbuf *
|
|||||||
shell_screenshot_composite_to_stream_finish (GAsyncResult *result,
|
shell_screenshot_composite_to_stream_finish (GAsyncResult *result,
|
||||||
GError **error)
|
GError **error)
|
||||||
{
|
{
|
||||||
g_return_val_if_fail (G_IS_TASK (result), FALSE);
|
g_return_val_if_fail (G_IS_TASK (result), NULL);
|
||||||
g_return_val_if_fail (g_async_result_is_tagged (result,
|
g_return_val_if_fail (g_async_result_is_tagged (result,
|
||||||
shell_screenshot_composite_to_stream),
|
shell_screenshot_composite_to_stream),
|
||||||
FALSE);
|
NULL);
|
||||||
|
|
||||||
return g_task_propagate_pointer (G_TASK (result), error);
|
return g_task_propagate_pointer (G_TASK (result), error);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user