isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell/screenshot: Throw error on failure

Browse Source 
Commit da537cda43 moved the Shell.Screenshot API to GIO's async pattern,
but we never set the GError passed to the *_finish() functions and only
indicate failure by returning FALSE.

The expected behavior is to throw an error in that situation, so make sure
we do that.

https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1123
This commit is contained in:
Florian Müllner
2020-03-24 07:15:26 +01:00
committed by Carlos Garnacho
parent 1bccbe7f11
commit 35484151ce
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/shell-screenshot.c
View File

@ -87,12 +87,12 @@ write_screenshot_thread (GTask *result,
gpointer task_data,
GCancellable *cancellable)
{
cairo_status_t status;
ShellScreenshot *screenshot = SHELL_SCREENSHOT (object);
ShellScreenshotPrivate *priv;
g_autoptr (GOutputStream) stream = NULL;
g_autoptr(GdkPixbuf) pixbuf = NULL;
g_autofree char *creation_time = NULL;
GError *error = NULL;
g_assert (screenshot != NULL);
@ -109,15 +109,15 @@ write_screenshot_thread (GTask *result,
if (!creation_time)
creation_time = g_date_time_format (priv->datetime, "%FT%T%z");
if (gdk_pixbuf_save_to_stream (pixbuf, stream, "png", NULL, NULL,
"tEXt::Software", "gnome-screenshot",
"tEXt::Creation Time", creation_time,
NULL))
status = CAIRO_STATUS_SUCCESS;
else
status = CAIRO_STATUS_WRITE_ERROR;
gdk_pixbuf_save_to_stream (pixbuf, stream, "png", NULL, &error,
"tEXt::Software", "gnome-screenshot",
"tEXt::Creation Time", creation_time,
NULL);
g_task_return_boolean (result, status == CAIRO_STATUS_SUCCESS);
if (error)
g_task_return_error (result, error);
else
g_task_return_boolean (result, TRUE);
}
static void