Added 2 fixup:
- revert some changes that can cause regressions;
- make compile if debug is enabled.

Frediano Ziglio (2):
  fixup! Improve MainChannel encapsulation
  fixup! Convert RedChannel hierarchy to GObject

Jonathon Jongsma (2):
  Improve MainChannel encapsulation
  Convert RedChannel hierarchy to GObject

 server/Makefile.am                  |   2 +
 server/common-graphics-channel.c    | 111 ++++--
 server/common-graphics-channel.h    |  42 ++-
 server/cursor-channel.c             | 135 ++++----
 server/cursor-channel.h             |  20 +-
 server/dcc-send.c                   |  11 +-
 server/dcc.c                        |   1 +
 server/dcc.h                        |   2 +-
 server/display-channel-private.h    |  76 +++++
 server/display-channel.c            | 234 ++++++++++---
 server/display-channel.h            | 100 ++----
 server/dummy-channel-client.c       |  17 +-
 server/dummy-channel.c              |  49 +++
 server/dummy-channel.h              |  60 ++++
 server/inputs-channel.c             | 140 +++++---
 server/inputs-channel.h             |  20 +-
 server/main-channel-client.c        |  62 ++--
 server/main-channel-client.h        |   5 +-
 server/main-channel.c               | 169 +++++++---
 server/main-channel.h               |  36 +-
 server/red-channel-client-private.h |  19 ++
 server/red-channel-client.c         | 179 ++++++----
 server/red-channel-client.h         |   6 +-
 server/red-channel.c                | 649 ++++++++++++++++++++++++------------
 server/red-channel.h                | 183 +++++-----
 server/red-parse-qxl.h              |   2 +
 server/red-qxl.c                    |  21 +-
 server/red-replay-qxl.c             |   2 +-
 server/red-worker.c                 |  27 +-
 server/red-worker.h                 |   2 -
 server/reds-private.h               |   3 +-
 server/reds.c                       |  66 ++--
 server/smartcard.c                  | 138 ++++++--
 server/sound.c                      |  44 ++-
 server/spicevmc.c                   | 450 +++++++++++++++++++------
 server/stream.c                     |   4 +-
 36 files changed, 2109 insertions(+), 978 deletions(-)
 create mode 100644 server/display-channel-private.h
 create mode 100644 server/dummy-channel.c
 create mode 100644 server/dummy-channel.h

-- 
2.7.4

_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Reply via email to