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

Port screenshot to GTask

Browse Source
This commit is contained in:
Florian Müllner 2015-09-25 20:09:11 +02:00
parent 8b4249ef26
commit 3e63fb7abe
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/shell-screenshot.c
View File

@ -64,7 +64,7 @@ on_screenshot_written (GObject *source,
if (priv->callback) if (priv->callback)
priv->callback (screenshot, priv->callback (screenshot,
g_simple_async_result_get_op_res_gboolean (G_SIMPLE_ASYNC_RESULT (result)), g_task_propagate_boolean (G_TASK (result), NULL),
&priv->screenshot_area, &priv->screenshot_area,
priv->filename_used); priv->filename_used);
@ -165,8 +165,9 @@ prepare_write_stream (const gchar *filename,
} }
static void static void
write_screenshot_thread (GSimpleAsyncResult *result, write_screenshot_thread (GTask *result,
GObject *object, gpointer object,
gpointer task_data,
GCancellable *cancellable) GCancellable *cancellable)
{ {
cairo_status_t status; cairo_status_t status;
@ -202,7 +203,7 @@ write_screenshot_thread (GSimpleAsyncResult *result,
} }
g_simple_async_result_set_op_res_gboolean (result, status == CAIRO_STATUS_SUCCESS); g_task_return_boolean (result, status == CAIRO_STATUS_SUCCESS);
g_clear_object (&stream); g_clear_object (&stream);
} }
@ -304,7 +305,7 @@ grab_screenshot (ClutterActor *stage,
MetaScreen *screen; MetaScreen *screen;
MetaCursorTracker *tracker; MetaCursorTracker *tracker;
int width, height; int width, height;
GSimpleAsyncResult *result; GTask *result;
GSettings *settings; GSettings *settings;
ShellScreenshotPrivate *priv = screenshot->priv; ShellScreenshotPrivate *priv = screenshot->priv;
@ -367,8 +368,8 @@ grab_screenshot (ClutterActor *stage,
g_signal_handlers_disconnect_by_func (stage, (void *)grab_screenshot, (gpointer)screenshot); g_signal_handlers_disconnect_by_func (stage, (void *)grab_screenshot, (gpointer)screenshot);
result = g_simple_async_result_new (G_OBJECT (screenshot), on_screenshot_written, NULL, grab_screenshot); result = g_task_new (screenshot, NULL, on_screenshot_written, NULL);
g_simple_async_result_run_in_thread (result, write_screenshot_thread, G_PRIORITY_DEFAULT, NULL); g_task_run_in_thread (result, write_screenshot_thread);
g_object_unref (result); g_object_unref (result);
} }
@ -376,7 +377,7 @@ static void
grab_area_screenshot (ClutterActor *stage, grab_area_screenshot (ClutterActor *stage,
ShellScreenshot *screenshot) ShellScreenshot *screenshot)
{ {
GSimpleAsyncResult *result; GTask *result;
ShellScreenshotPrivate *priv = screenshot->priv; ShellScreenshotPrivate *priv = screenshot->priv;
do_grab_screenshot (screenshot, do_grab_screenshot (screenshot,
@ -386,8 +387,8 @@ grab_area_screenshot (ClutterActor *stage,
priv->screenshot_area.height); priv->screenshot_area.height);
g_signal_handlers_disconnect_by_func (stage, (void *)grab_area_screenshot, (gpointer)screenshot); g_signal_handlers_disconnect_by_func (stage, (void *)grab_area_screenshot, (gpointer)screenshot);
result = g_simple_async_result_new (G_OBJECT (screenshot), on_screenshot_written, NULL, grab_area_screenshot); result = g_task_new (screenshot, NULL, on_screenshot_written, NULL);
g_simple_async_result_run_in_thread (result, write_screenshot_thread, G_PRIORITY_DEFAULT, NULL); g_task_run_in_thread (result, write_screenshot_thread);
g_object_unref (result); g_object_unref (result);
} }
@ -396,7 +397,7 @@ grab_window_screenshot (ClutterActor *stage,
ShellScreenshot *screenshot) ShellScreenshot *screenshot)
{ {
ShellScreenshotPrivate *priv = screenshot->priv; ShellScreenshotPrivate *priv = screenshot->priv;
GSimpleAsyncResult *result; GTask *result;
GSettings *settings; GSettings *settings;
MetaScreen *screen = shell_global_get_screen (priv->global); MetaScreen *screen = shell_global_get_screen (priv->global);
MetaCursorTracker *tracker; MetaCursorTracker *tracker;
@ -436,8 +437,8 @@ grab_window_screenshot (ClutterActor *stage,
g_object_unref (settings); g_object_unref (settings);
g_signal_handlers_disconnect_by_func (stage, (void *)grab_window_screenshot, (gpointer)screenshot); g_signal_handlers_disconnect_by_func (stage, (void *)grab_window_screenshot, (gpointer)screenshot);
result = g_simple_async_result_new (G_OBJECT (screenshot), on_screenshot_written, NULL, grab_window_screenshot); result = g_task_new (screenshot, NULL, on_screenshot_written, NULL);
g_simple_async_result_run_in_thread (result, write_screenshot_thread, G_PRIORITY_DEFAULT, NULL); g_task_run_in_thread (result, write_screenshot_thread);
g_object_unref (result); g_object_unref (result);
} }