[Spice-devel] [spice-gtk 3/3] Remove explicit glib-compat.h includes
Christophe Fergeau
cfergeau at redhat.com
Thu Feb 27 04:47:01 PST 2014
Now that all .c files include config.h and since config.h includes
glib-compat.h, we can remove explicit glib-compat.h includes from C files.
---
gtk/channel-cursor.c | 1 -
gtk/channel-display.c | 1 -
gtk/channel-main.c | 1 -
gtk/channel-port.c | 1 -
gtk/channel-usbredir.c | 1 -
gtk/desktop-integration.c | 1 -
gtk/smartcard-manager.c | 2 --
gtk/spice-audio.c | 2 --
gtk/spice-channel.c | 1 -
gtk/spice-client-glib-usb-acl-helper.c | 2 --
gtk/spice-session.c | 1 -
gtk/spice-uri.c | 1 -
gtk/spice-widget.c | 2 --
gtk/spicy.c | 1 -
gtk/usb-acl-helper.c | 1 -
gtk/usb-device-manager.c | 2 --
gtk/usb-device-widget.c | 1 -
gtk/usbutil.c | 2 --
gtk/vmcstream.c | 1 -
gtk/wocky-http-proxy.c | 1 -
20 files changed, 26 deletions(-)
diff --git a/gtk/channel-cursor.c b/gtk/channel-cursor.c
index d7242a6..38b3ee6 100644
--- a/gtk/channel-cursor.c
+++ b/gtk/channel-cursor.c
@@ -17,7 +17,6 @@
*/
#include "config.h"
-#include "glib-compat.h"
#include "spice-client.h"
#include "spice-common.h"
diff --git a/gtk/channel-display.c b/gtk/channel-display.c
index 96fd764..483b8db 100644
--- a/gtk/channel-display.c
+++ b/gtk/channel-display.c
@@ -31,7 +31,6 @@
#include <sys/ipc.h>
#endif
-#include "glib-compat.h"
#include "spice-client.h"
#include "spice-common.h"
diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index 58f5d31..d42b7ba 100644
--- a/gtk/channel-main.c
+++ b/gtk/channel-main.c
@@ -22,7 +22,6 @@
#include <common/rect.h>
#include <glib/gstdio.h>
-#include "glib-compat.h"
#include "spice-client.h"
#include "spice-common.h"
#include "spice-marshal.h"
diff --git a/gtk/channel-port.c b/gtk/channel-port.c
index ad85afd..98f2168 100644
--- a/gtk/channel-port.c
+++ b/gtk/channel-port.c
@@ -21,7 +21,6 @@
#include "spice-common.h"
#include "spice-channel-priv.h"
#include "spice-marshal.h"
-#include "glib-compat.h"
/**
* SECTION:channel-port
diff --git a/gtk/channel-usbredir.c b/gtk/channel-usbredir.c
index 239fe12..42d3628 100644
--- a/gtk/channel-usbredir.c
+++ b/gtk/channel-usbredir.c
@@ -36,7 +36,6 @@
#include "spice-common.h"
#include "spice-channel-priv.h"
-#include "glib-compat.h"
/**
* SECTION:channel-usbredir
diff --git a/gtk/desktop-integration.c b/gtk/desktop-integration.c
index d764e56..5944ba7 100644
--- a/gtk/desktop-integration.c
+++ b/gtk/desktop-integration.c
@@ -26,7 +26,6 @@
#include <dbus/dbus-glib.h>
#endif
-#include "glib-compat.h"
#include "spice-session-priv.h"
#include "desktop-integration.h"
diff --git a/gtk/smartcard-manager.c b/gtk/smartcard-manager.c
index 683a47e..0281bda 100644
--- a/gtk/smartcard-manager.c
+++ b/gtk/smartcard-manager.c
@@ -20,8 +20,6 @@
#include <glib-object.h>
#include <string.h>
-#include "glib-compat.h"
-
#ifdef USE_SMARTCARD
#include <vcard_emul.h>
#include <vevent.h>
diff --git a/gtk/spice-audio.c b/gtk/spice-audio.c
index dbd3a8b..35b9b90 100644
--- a/gtk/spice-audio.c
+++ b/gtk/spice-audio.c
@@ -51,8 +51,6 @@
#include "spice-gstaudio.h"
#endif
-#include "glib-compat.h"
-
#define SPICE_AUDIO_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), SPICE_TYPE_AUDIO, SpiceAudioPrivate))
diff --git a/gtk/spice-channel.c b/gtk/spice-channel.c
index 122dd91..03b6cf4 100644
--- a/gtk/spice-channel.c
+++ b/gtk/spice-channel.c
@@ -19,7 +19,6 @@
#include "spice-client.h"
#include "spice-common.h"
-#include "glib-compat.h"
#include "spice-channel-priv.h"
#include "spice-session-priv.h"
diff --git a/gtk/spice-client-glib-usb-acl-helper.c b/gtk/spice-client-glib-usb-acl-helper.c
index 3ed6cad..8d5054d 100644
--- a/gtk/spice-client-glib-usb-acl-helper.c
+++ b/gtk/spice-client-glib-usb-acl-helper.c
@@ -36,8 +36,6 @@
#include <polkit/polkit.h>
#include <acl/libacl.h>
-#include "glib-compat.h"
-
#define FATAL_ERROR(...) \
do { \
/* We print the error both to stdout, for the app invoking us and \
diff --git a/gtk/spice-session.c b/gtk/spice-session.c
index 8ef90cf..f217507 100644
--- a/gtk/spice-session.c
+++ b/gtk/spice-session.c
@@ -28,7 +28,6 @@
#include "spice-util-priv.h"
#include "spice-session-priv.h"
#include "gio-coroutine.h"
-#include "glib-compat.h"
#include "wocky-http-proxy.h"
#include "spice-uri-priv.h"
#include "channel-playback-priv.h"
diff --git a/gtk/spice-uri.c b/gtk/spice-uri.c
index c379075..1fe54b4 100644
--- a/gtk/spice-uri.c
+++ b/gtk/spice-uri.c
@@ -20,7 +20,6 @@
#include <stdlib.h>
#include <string.h>
-#include "glib-compat.h"
#include "spice-client.h"
#include "spice-uri.h"
diff --git a/gtk/spice-widget.c b/gtk/spice-widget.c
index 504a0b5..8c2ea2f 100644
--- a/gtk/spice-widget.c
+++ b/gtk/spice-widget.c
@@ -40,8 +40,6 @@
#include "spice-gtk-session-priv.h"
#include "vncdisplaykeymap.h"
-#include "glib-compat.h"
-
/* Some compatibility defines to let us build on both Gtk2 and Gtk3 */
#if GTK_CHECK_VERSION (2, 91, 0)
static inline void gdk_drawable_get_size(GdkWindow *w, gint *ww, gint *wh)
diff --git a/gtk/spicy.c b/gtk/spicy.c
index 038d622..a370c48 100644
--- a/gtk/spicy.c
+++ b/gtk/spicy.c
@@ -31,7 +31,6 @@
#include "smartcard-manager.h"
#endif
-#include "glib-compat.h"
#include "spice-widget.h"
#include "spice-gtk-session.h"
#include "spice-audio.h"
diff --git a/gtk/usb-acl-helper.c b/gtk/usb-acl-helper.c
index a3ba14d..c7c006e 100644
--- a/gtk/usb-acl-helper.c
+++ b/gtk/usb-acl-helper.c
@@ -26,7 +26,6 @@
#include <string.h>
#include "usb-acl-helper.h"
-#include "glib-compat.h"
/* ------------------------------------------------------------------ */
/* gobject glue */
diff --git a/gtk/usb-device-manager.c b/gtk/usb-device-manager.c
index 1051d10..1c82df6 100644
--- a/gtk/usb-device-manager.c
+++ b/gtk/usb-device-manager.c
@@ -23,8 +23,6 @@
#include <glib-object.h>
-#include "glib-compat.h"
-
#ifdef USE_USBREDIR
#include <errno.h>
#include <libusb.h>
diff --git a/gtk/usb-device-widget.c b/gtk/usb-device-widget.c
index 69c74b3..ca97808 100644
--- a/gtk/usb-device-widget.c
+++ b/gtk/usb-device-widget.c
@@ -21,7 +21,6 @@
#include "config.h"
#include <glib/gi18n.h>
-#include "glib-compat.h"
#include "spice-client.h"
#include "spice-marshal.h"
#include "usb-device-widget.h"
diff --git a/gtk/usbutil.c b/gtk/usbutil.c
index 18fb14c..df00a45 100644
--- a/gtk/usbutil.c
+++ b/gtk/usbutil.c
@@ -28,8 +28,6 @@
#include <ctype.h>
#include <stdlib.h>
-#include "glib-compat.h"
-
#ifdef USE_USBREDIR
#ifdef __linux__
#include <stdio.h>
diff --git a/gtk/vmcstream.c b/gtk/vmcstream.c
index 483dd5a..55ac6c0 100644
--- a/gtk/vmcstream.c
+++ b/gtk/vmcstream.c
@@ -22,7 +22,6 @@
#include "vmcstream.h"
#include "spice-channel-priv.h"
#include "gio-coroutine.h"
-#include "glib-compat.h"
struct _SpiceVmcInputStream
{
diff --git a/gtk/wocky-http-proxy.c b/gtk/wocky-http-proxy.c
index fa519ec..4226b10 100644
--- a/gtk/wocky-http-proxy.c
+++ b/gtk/wocky-http-proxy.c
@@ -22,7 +22,6 @@
#include "config.h"
-#include "glib-compat.h"
#include "wocky-http-proxy.h"
#include <string.h>
--
1.8.5.3
More information about the Spice-devel
mailing list