diff options
author | Hans de Goede <hdegoede@redhat.com> | 2012-01-18 11:17:21 +0100 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2012-01-18 11:17:21 +0100 |
commit | 35d35634a947d9aa050fcdcddeb14727b2614b3b (patch) | |
tree | dc4534e1f54356171f6640ed7430870de06912ef /server | |
parent | df875563a70773ddaa1151796a2e42e7c9867841 (diff) | |
parent | a3a3b34a46f57ce86da444532e1db292638a74cd (diff) | |
download | spice-35d35634a947d9aa050fcdcddeb14727b2614b3b.tar.gz spice-35d35634a947d9aa050fcdcddeb14727b2614b3b.tar.xz spice-35d35634a947d9aa050fcdcddeb14727b2614b3b.zip |
Merge commit 'a3a3b34a46f57ce86da444532e1db292638a74cd' into 0.10
Diffstat (limited to 'server')
-rw-r--r-- | server/red_parse_qxl.c | 6 | ||||
-rw-r--r-- | server/red_parse_qxl.h | 18 | ||||
-rw-r--r-- | server/spicevmc.c | 6 |
3 files changed, 17 insertions, 13 deletions
diff --git a/server/red_parse_qxl.c b/server/red_parse_qxl.c index 7737c047..743a82d2 100644 --- a/server/red_parse_qxl.c +++ b/server/red_parse_qxl.c @@ -7,10 +7,10 @@ License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <http://www.gnu.org/licenses/>. diff --git a/server/red_parse_qxl.h b/server/red_parse_qxl.h index 93978522..c2edfb92 100644 --- a/server/red_parse_qxl.h +++ b/server/red_parse_qxl.h @@ -2,18 +2,18 @@ /* Copyright (C) 2009,2010 Red Hat, Inc. - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #ifndef RED_ABI_TRANSLATE_H diff --git a/server/spicevmc.c b/server/spicevmc.c index 85809840..b1a7d8dc 100644 --- a/server/spicevmc.c +++ b/server/spicevmc.c @@ -99,7 +99,11 @@ static void spicevmc_red_channel_client_on_disconnect(RedChannelClient *rcc) sin = state->chardev_sin; sif = SPICE_CONTAINEROF(sin->base.sif, SpiceCharDeviceInterface, base); - red_channel_client_destroy(rcc); + /* Don't destroy the rcc if the entire client is disconnecting, as then + red_client_destroy will already do this! */ + if (!rcc->client->disconnecting) + red_channel_client_destroy(rcc); + state->rcc = NULL; if (sif->state) { sif->state(sin, 0); |