From cfdc8055beb83f58cb23bccb739c68ce47b00e64 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Fri, 1 Jul 2011 13:42:08 +0100
Subject: Fix some compile warnings

---
 src/view/drawer.c | 3 ++-
 src/viewer.c      | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/view/drawer.c b/src/view/drawer.c
index aec0728..43b7e1a 100644
--- a/src/view/drawer.c
+++ b/src/view/drawer.c
@@ -67,7 +67,7 @@ static ViewOvBoxClass *parentClass;
 
 static void
 ViewDrawerInit(GTypeInstance *instance, // IN
-               gpointer klass)          // Unused
+               gpointer klass G_GNUC_UNUSED)          // Unused
 {
    ViewDrawer *that;
 
@@ -175,6 +175,7 @@ ViewDrawer_GetType(void)
          sizeof (ViewDrawer),
          0, /* n_preallocs */
          (GInstanceInitFunc)ViewDrawerInit,
+	 NULL
       };
 
       type = g_type_register_static(VIEW_TYPE_OV_BOX, "ViewDrawer", &info, 0);
diff --git a/src/viewer.c b/src/viewer.c
index 577f6bb..27ea056 100644
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -931,9 +931,9 @@ cleanup:
 	return retval;
 }
 
+#if defined(HAVE_SOCKETPAIR) && defined(HAVE_FORK)
 void viewer_channel_open_fd(VirtViewer *viewer, VirtViewerDisplayChannel *channel)
 {
-#if defined(HAVE_SOCKETPAIR) && defined(HAVE_FORK)
 	int fd = -1;
 
 	g_return_if_fail(viewer != NULL);
@@ -949,10 +949,14 @@ void viewer_channel_open_fd(VirtViewer *viewer, VirtViewerDisplayChannel *channe
 
 	if (fd >= 0)
 		virt_viewer_display_channel_open_fd(viewer->display, channel, fd);
+}
 #else
+void viewer_channel_open_fd(VirtViewer *viewer G_GNUC_UNUSED,
+			    VirtViewerDisplayChannel *channel G_GNUC_UNUSED)
+{
 	viewer_simple_message_dialog(viewer->window, _("Connect to channel unsupported."));
-#endif
 }
+#endif
 
 static int viewer_activate(VirtViewer *viewer,
 			   virDomainPtr dom)
-- 
cgit