diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-03 13:43:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-03 13:43:28 +0100 |
| commit | 0cb34ff32e3123d79daac898496ed479aede7954 (patch) | |
| tree | b280c446b03defcc26e96d32e610638cb00c20f7 | |
| parent | 90f54472f407f1d0ad0ccab6f59d65b286f269b2 (diff) | |
| parent | bc35d51077b33e68a0ab10a057f352747214223f (diff) | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-qio-next-2016-08-03-v1' into staging
Merge qio-next 2016-08-03 v1
# gpg: Signature made Wed 03 Aug 2016 10:48:08 BST
# gpg: using RSA key 0xBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/pull-qio-next-2016-08-03-v1:
io: remove mistaken call to object_ref on QTask
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | io/channel-websock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/io/channel-websock.c b/io/channel-websock.c index 239c75a979..533bd4b3b5 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -317,14 +317,13 @@ static gboolean qio_channel_websock_handshake_io(QIOChannel *ioc, return TRUE; } - object_ref(OBJECT(task)); trace_qio_channel_websock_handshake_reply(ioc); qio_channel_add_watch( wioc->master, G_IO_OUT, qio_channel_websock_handshake_send, task, - (GDestroyNotify)object_unref); + NULL); return FALSE; } |