projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[kdbus] Update kdbus interface header (commit: c34e65633b4e)
[platform/upstream/glib.git]
/
gio
/
gsocketclient.c
diff --git
a/gio/gsocketclient.c
b/gio/gsocketclient.c
index
382b6b6
..
2cd9893
100644
(file)
--- a/
gio/gsocketclient.c
+++ b/
gio/gsocketclient.c
@@
-1492,6
+1492,12
@@
g_socket_client_connected_callback (GObject *source,
GProxy *proxy;
const gchar *protocol;
+ if (g_task_return_error_if_cancelled (data->task))
+ {
+ g_object_unref (data->task);
+ return;
+ }
+
if (!g_socket_connection_connect_finish (G_SOCKET_CONNECTION (source),
result, &error))
{