This is a second approach suggested by Marc-Andre to fix up some of the issues with circular includes in the public headers. It will break the build of applications using spice-gtk, but is very easy to fix since we print out an explicit compiler error in that case. If accepted, I intend to push this after the current release comes out. Jonathon Jongsma (4): Glib applications only include spice-client.h Gtk applications only include spice-client-gtk.h Don't wrap included headers in G_BEGIN|END_DECLS Only include spice-client.h where necessary doc/reference/Makefile.am | 2 +- src/Makefile.am | 2 ++ src/channel-base.c | 2 +- src/channel-cursor.c | 4 ++-- src/channel-cursor.h | 6 +++++- src/channel-display-mjpeg.c | 1 - src/channel-display.c | 4 ++-- src/channel-display.h | 7 ++++++- src/channel-inputs.c | 4 ++-- src/channel-inputs.h | 6 +++++- src/channel-main.c | 3 ++- src/channel-main.h | 6 +++++- src/channel-playback-priv.h | 2 ++ src/channel-playback.c | 4 ++-- src/channel-playback.h | 6 +++++- src/channel-port.c | 2 +- src/channel-port.h | 4 ++++ src/channel-record.c | 4 ++-- src/channel-record.h | 6 +++++- src/channel-smartcard.c | 4 ++-- src/channel-smartcard.h | 6 +++++- src/channel-usbredir-priv.h | 3 ++- src/channel-usbredir.c | 3 +-- src/channel-usbredir.h | 6 +++++- src/channel-webdav.c | 4 ++-- src/channel-webdav.h | 5 ++++- src/desktop-integration.h | 2 +- src/smartcard-manager.c | 2 +- src/smartcard-manager.h | 6 +++++- src/spice-audio.c | 3 +-- src/spice-audio.h | 5 +++++ src/spice-channel.c | 2 +- src/spice-channel.h | 7 ++++++- src/spice-client-gtk.h | 32 ++++++++++++++++++++++++++++++++ src/spice-client.h | 4 ++++ src/spice-cmdline.c | 1 - src/spice-cmdline.h | 2 ++ src/spice-grabsequence.h | 4 ++++ src/spice-gstaudio.c | 2 ++ src/spice-gstaudio.h | 2 +- src/spice-gtk-session.c | 4 +++- src/spice-gtk-session.h | 6 +++++- src/spice-option.h | 4 ++++ src/spice-pulse.c | 1 + src/spice-pulse.h | 1 - src/spice-session-priv.h | 1 + src/spice-session.c | 4 ++-- src/spice-session.h | 4 ++++ src/spice-types.h | 4 ++++ src/spice-uri.c | 2 +- src/spice-uri.h | 4 ++++ src/spice-util.c | 2 +- src/spice-version.h.in | 4 ++++ src/spice-widget-priv.h | 8 ++++++-- src/spice-widget.c | 3 ++- src/spice-widget.h | 4 +++- src/spicy.c | 4 +--- src/usb-device-manager.c | 2 +- src/usb-device-manager.h | 8 +++++++- src/usb-device-widget.c | 3 +-- src/usb-device-widget.h | 6 +++++- 61 files changed, 200 insertions(+), 59 deletions(-) create mode 100644 src/spice-client-gtk.h -- 2.1.0 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel