[Spice-devel] [PATCH spice-gtk 09/15] Replace duplicated header declarations

[Daniel P. Berrange]

From: "Daniel P. Berrange" <berrange at redhat.com>

The usb-helper-acl.h header file duplicated some declarations
already present in usb-device-manager.h

The channel-display.c file declared the object init function
which is already done by the GObject helper macros

* gtk/channel-display.c: Remove duplicate decl of init function
* gtk/usb-acl-helper.h: Remove duplicate decls
---
 gtk/channel-display.c |    1 -
 gtk/usb-acl-helper.h  |    3 ---
 2 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/gtk/channel-display.c b/gtk/channel-display.c
index 2473ac6..d728fef 100644
--- a/gtk/channel-display.c
+++ b/gtk/channel-display.c
@@ -97,7 +97,6 @@ enum {
 static guint signals[SPICE_DISPLAY_LAST_SIGNAL];
 
 static void spice_display_handle_msg(SpiceChannel *channel, SpiceMsgIn *msg);
-static void spice_display_channel_init(SpiceDisplayChannel *channel);
 static void spice_display_channel_up(SpiceChannel *channel);
 
 static void clear_surfaces(SpiceChannel *channel);
diff --git a/gtk/usb-acl-helper.h b/gtk/usb-acl-helper.h
index c43bdd0..2d41b68 100644
--- a/gtk/usb-acl-helper.h
+++ b/gtk/usb-acl-helper.h
@@ -35,8 +35,6 @@ G_BEGIN_DECLS
 #define SPICE_IS_USB_ACL_HELPER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SPICE_TYPE_USB_ACL_HELPER))
 #define SPICE_USB_ACL_HELPER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), SPICE_TYPE_USB_ACL_HELPER, SpiceUsbAclHelperClass))
 
-#define SPICE_TYPE_USB_DEVICE                    (spice_usb_device_get_type())
-
 typedef struct _SpiceUsbAclHelper SpiceUsbAclHelper;
 typedef struct _SpiceUsbAclHelperClass SpiceUsbAclHelperClass;
 typedef struct _SpiceUsbAclHelperPrivate SpiceUsbAclHelperPrivate;
@@ -55,7 +53,6 @@ struct _SpiceUsbAclHelperClass
     GObjectClass parent_class;
 };
 
-GType spice_usb_device_get_type(void);
 GType spice_usb_acl_helper_get_type(void);
 
 SpiceUsbAclHelper *spice_usb_acl_helper_new(void);
-- 
1.7.7.6