Fix some compile warnings

This commit is contained in:
Daniel P. Berrange 2011-07-01 13:42:08 +01:00
parent 4c210b712c
commit cfdc8055be
2 changed files with 10 additions and 5 deletions

View File

@ -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);

View File

@ -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
viewer_simple_message_dialog(viewer->window, _("Connect to channel unsupported."));
#endif
}
#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
static int viewer_activate(VirtViewer *viewer,
virDomainPtr dom)