summaryrefslogtreecommitdiffstats
path: root/src/virt-viewer-session-vnc.c
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2012-01-31 15:01:08 +0000
committerDaniel P. Berrange <berrange@redhat.com>2012-02-06 12:40:09 +0000
commite1283a9a60ef55f2e18d53e830874c76db526d66 (patch)
tree55d495d5cab4acc6a213662bb7d208610ab0c130 /src/virt-viewer-session-vnc.c
parentc67a8cfdbed878674f0c15c5f40b88cccedf391a (diff)
downloadvirt-viewer-e1283a9a60ef55f2e18d53e830874c76db526d66.tar.gz
virt-viewer-e1283a9a60ef55f2e18d53e830874c76db526d66.tar.xz
virt-viewer-e1283a9a60ef55f2e18d53e830874c76db526d66.zip
Convert TABS to spaces & reindent everywhere
Diffstat (limited to 'src/virt-viewer-session-vnc.c')
-rw-r--r--src/virt-viewer-session-vnc.c251
1 files changed, 124 insertions, 127 deletions
diff --git a/src/virt-viewer-session-vnc.c b/src/virt-viewer-session-vnc.c
index 7f660ea..19116dd 100644
--- a/src/virt-viewer-session-vnc.c
+++ b/src/virt-viewer-session-vnc.c
@@ -32,8 +32,8 @@
G_DEFINE_TYPE(VirtViewerSessionVnc, virt_viewer_session_vnc, VIRT_VIEWER_TYPE_SESSION)
struct _VirtViewerSessionVncPrivate {
- /* XXX we should really just have a VncConnection */
- VncDisplay *vnc;
+ /* XXX we should really just have a VncConnection */
+ VncDisplay *vnc;
};
#define VIRT_VIEWER_SESSION_VNC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), VIRT_VIEWER_TYPE_SESSION_VNC, VirtViewerSessionVncPrivate))
@@ -43,243 +43,240 @@ static gboolean virt_viewer_session_vnc_open_fd(VirtViewerSession* session, int
static gboolean virt_viewer_session_vnc_open_host(VirtViewerSession* session, char *host, char *port);
static gboolean virt_viewer_session_vnc_open_uri(VirtViewerSession* session, char *uri);
static gboolean virt_viewer_session_vnc_channel_open_fd(VirtViewerSession* session,
- VirtViewerSessionChannel* channel, int fd);
+ VirtViewerSessionChannel* channel, int fd);
static void
virt_viewer_session_vnc_finalize(GObject *obj)
{
- VirtViewerSessionVnc *vnc = VIRT_VIEWER_SESSION_VNC(obj);
+ VirtViewerSessionVnc *vnc = VIRT_VIEWER_SESSION_VNC(obj);
- if (vnc->priv->vnc) {
- vnc_display_close(vnc->priv->vnc);
- g_object_unref(vnc->priv->vnc);
- }
+ if (vnc->priv->vnc) {
+ vnc_display_close(vnc->priv->vnc);
+ g_object_unref(vnc->priv->vnc);
+ }
- G_OBJECT_CLASS(virt_viewer_session_vnc_parent_class)->finalize(obj);
+ G_OBJECT_CLASS(virt_viewer_session_vnc_parent_class)->finalize(obj);
}
static void
virt_viewer_session_vnc_class_init(VirtViewerSessionVncClass *klass)
{
- VirtViewerSessionClass *dclass = VIRT_VIEWER_SESSION_CLASS(klass);
- GObjectClass *oclass = G_OBJECT_CLASS(klass);
+ VirtViewerSessionClass *dclass = VIRT_VIEWER_SESSION_CLASS(klass);
+ GObjectClass *oclass = G_OBJECT_CLASS(klass);
- oclass->finalize = virt_viewer_session_vnc_finalize;
+ oclass->finalize = virt_viewer_session_vnc_finalize;
- dclass->close = virt_viewer_session_vnc_close;
- dclass->open_fd = virt_viewer_session_vnc_open_fd;
- dclass->open_host = virt_viewer_session_vnc_open_host;
- dclass->open_uri = virt_viewer_session_vnc_open_uri;
- dclass->channel_open_fd = virt_viewer_session_vnc_channel_open_fd;
+ dclass->close = virt_viewer_session_vnc_close;
+ dclass->open_fd = virt_viewer_session_vnc_open_fd;
+ dclass->open_host = virt_viewer_session_vnc_open_host;
+ dclass->open_uri = virt_viewer_session_vnc_open_uri;
+ dclass->channel_open_fd = virt_viewer_session_vnc_channel_open_fd;
- g_type_class_add_private(klass, sizeof(VirtViewerSessionVncPrivate));
+ g_type_class_add_private(klass, sizeof(VirtViewerSessionVncPrivate));
}
static void
virt_viewer_session_vnc_init(VirtViewerSessionVnc *self G_GNUC_UNUSED)
{
- self->priv = VIRT_VIEWER_SESSION_VNC_GET_PRIVATE(self);
+ self->priv = VIRT_VIEWER_SESSION_VNC_GET_PRIVATE(self);
}
static void
virt_viewer_session_vnc_connected(VncDisplay *vnc G_GNUC_UNUSED,
- VirtViewerSessionVnc *session)
+ VirtViewerSessionVnc *session)
{
- GtkWidget *display = virt_viewer_display_vnc_new(session->priv->vnc);
- g_signal_emit_by_name(session, "session-connected");
- virt_viewer_display_set_show_hint(VIRT_VIEWER_DISPLAY(display),
- VIRT_VIEWER_DISPLAY_SHOW_HINT_READY);
- virt_viewer_session_add_display(VIRT_VIEWER_SESSION(session),
- VIRT_VIEWER_DISPLAY(display));
+ GtkWidget *display = virt_viewer_display_vnc_new(session->priv->vnc);
+ g_signal_emit_by_name(session, "session-connected");
+ virt_viewer_display_set_show_hint(VIRT_VIEWER_DISPLAY(display),
+ VIRT_VIEWER_DISPLAY_SHOW_HINT_READY);
+ virt_viewer_session_add_display(VIRT_VIEWER_SESSION(session),
+ VIRT_VIEWER_DISPLAY(display));
}
static void
virt_viewer_session_vnc_disconnected(VncDisplay *vnc G_GNUC_UNUSED,
- VirtViewerSessionVnc *session)
+ VirtViewerSessionVnc *session)
{
- g_signal_emit_by_name(session, "session-disconnected");
- /* TODO perhaps? */
- /* virt_viewer_display_set_show_hint(VIRT_VIEWER_DISPLAY(session->priv->vnc), */
- /* VIRT_VIEWER_DISPLAY_SHOW_HINT_HIDE); */
+ g_signal_emit_by_name(session, "session-disconnected");
+ /* TODO perhaps? */
+ /* virt_viewer_display_set_show_hint(VIRT_VIEWER_DISPLAY(session->priv->vnc), */
+ /* VIRT_VIEWER_DISPLAY_SHOW_HINT_HIDE); */
}
static void
virt_viewer_session_vnc_initialized(VncDisplay *vnc G_GNUC_UNUSED,
- VirtViewerSessionVnc *session)
+ VirtViewerSessionVnc *session)
{
- g_signal_emit_by_name(session, "session-initialized");
+ g_signal_emit_by_name(session, "session-initialized");
}
static void
virt_viewer_session_vnc_cut_text(VncDisplay *vnc G_GNUC_UNUSED,
- const char *text,
- VirtViewerSession *session)
+ const char *text,
+ VirtViewerSession *session)
{
- g_signal_emit_by_name(session, "session-cut-text", text);
+ g_signal_emit_by_name(session, "session-cut-text", text);
}
static void
virt_viewer_session_vnc_bell(VncDisplay *vnc G_GNUC_UNUSED,
- VirtViewerSession *session)
+ VirtViewerSession *session)
{
- g_signal_emit_by_name(session, "session-bell");
+ g_signal_emit_by_name(session, "session-bell");
}
static void
virt_viewer_session_vnc_auth_unsupported(VncDisplay *vnc G_GNUC_UNUSED,
- unsigned int authType,
- VirtViewerSession *session)
+ unsigned int authType,
+ VirtViewerSession *session)
{
- char *msg = g_strdup_printf(_("Unsupported authentication type %d"),
- authType);
- g_signal_emit_by_name(session, "session-auth-failed", msg);
- g_free(msg);
+ char *msg = g_strdup_printf(_("Unsupported authentication type %d"),
+ authType);
+ g_signal_emit_by_name(session, "session-auth-failed", msg);
+ g_free(msg);
}
static void
virt_viewer_session_vnc_auth_failure(VncDisplay *vnc G_GNUC_UNUSED,
- const char *reason,
- VirtViewerSession *session)
+ const char *reason,
+ VirtViewerSession *session)
{
- g_signal_emit_by_name(session, "session-auth-refused", reason);
+ g_signal_emit_by_name(session, "session-auth-refused", reason);
}
static gboolean
virt_viewer_session_vnc_open_fd(VirtViewerSession* session,
- int fd)
+ int fd)
{
- VirtViewerSessionVnc *self = VIRT_VIEWER_SESSION_VNC(session);
+ VirtViewerSessionVnc *self = VIRT_VIEWER_SESSION_VNC(session);
- g_return_val_if_fail(self != NULL, FALSE);
- g_return_val_if_fail(self->priv->vnc != NULL, FALSE);
+ g_return_val_if_fail(self != NULL, FALSE);
+ g_return_val_if_fail(self->priv->vnc != NULL, FALSE);
- return vnc_display_open_fd(self->priv->vnc, fd);
+ return vnc_display_open_fd(self->priv->vnc, fd);
}
static gboolean
virt_viewer_session_vnc_channel_open_fd(VirtViewerSession* session G_GNUC_UNUSED,
- VirtViewerSessionChannel* channel G_GNUC_UNUSED,
- int fd G_GNUC_UNUSED)
+ VirtViewerSessionChannel* channel G_GNUC_UNUSED,
+ int fd G_GNUC_UNUSED)
{
- g_warning("channel_open_fd is not supported by VNC");
- return FALSE;
+ g_warning("channel_open_fd is not supported by VNC");
+ return FALSE;
}
static gboolean
virt_viewer_session_vnc_open_host(VirtViewerSession* session,
- char *host,
- char *port)
+ char *host,
+ char *port)
{
- VirtViewerSessionVnc *self = VIRT_VIEWER_SESSION_VNC(session);
+ VirtViewerSessionVnc *self = VIRT_VIEWER_SESSION_VNC(session);
- g_return_val_if_fail(self != NULL, FALSE);
- g_return_val_if_fail(self->priv->vnc != NULL, FALSE);
+ g_return_val_if_fail(self != NULL, FALSE);
+ g_return_val_if_fail(self->priv->vnc != NULL, FALSE);
- return vnc_display_open_host(self->priv->vnc, host, port);
+ return vnc_display_open_host(self->priv->vnc, host, port);
}
static gboolean
virt_viewer_session_vnc_open_uri(VirtViewerSession* session,
- char *uristr)
+ char *uristr)
{
- VirtViewerSessionVnc *self = VIRT_VIEWER_SESSION_VNC(session);
- xmlURIPtr uri = NULL;
- gchar *portstr;
- gboolean ret;
+ VirtViewerSessionVnc *self = VIRT_VIEWER_SESSION_VNC(session);
+ xmlURIPtr uri = NULL;
+ gchar *portstr;
+ gboolean ret;
- g_return_val_if_fail(self != NULL, FALSE);
- g_return_val_if_fail(self->priv->vnc != NULL, FALSE);
+ g_return_val_if_fail(self != NULL, FALSE);
+ g_return_val_if_fail(self->priv->vnc != NULL, FALSE);
- if (!(uri = xmlParseURI(uristr)))
- return FALSE;
+ if (!(uri = xmlParseURI(uristr)))
+ return FALSE;
- portstr = g_strdup_printf("%d", uri->port);
+ portstr = g_strdup_printf("%d", uri->port);
- ret = vnc_display_open_host(self->priv->vnc, uri->server, portstr);
- g_free(portstr);
- xmlFreeURI(uri);
- return ret;
+ ret = vnc_display_open_host(self->priv->vnc, uri->server, portstr);
+ g_free(portstr);
+ xmlFreeURI(uri);
+ return ret;
}
static void
virt_viewer_session_vnc_close(VirtViewerSession* session)
{
- VirtViewerSessionVnc *self = VIRT_VIEWER_SESSION_VNC(session);
+ VirtViewerSessionVnc *self = VIRT_VIEWER_SESSION_VNC(session);
- g_return_if_fail(self != NULL);
+ g_return_if_fail(self != NULL);
- if (self->priv->vnc != NULL) {
- virt_viewer_session_clear_displays(session);
- vnc_display_close(self->priv->vnc);
- g_object_unref(self->priv->vnc);
- }
+ if (self->priv->vnc != NULL) {
+ virt_viewer_session_clear_displays(session);
+ vnc_display_close(self->priv->vnc);
+ g_object_unref(self->priv->vnc);
+ }
- self->priv->vnc = VNC_DISPLAY(vnc_display_new());
+ self->priv->vnc = VNC_DISPLAY(vnc_display_new());
- g_signal_connect(self->priv->vnc, "vnc-connected",
- G_CALLBACK(virt_viewer_session_vnc_connected), session);
- g_signal_connect(self->priv->vnc, "vnc-initialized",
- G_CALLBACK(virt_viewer_session_vnc_initialized), session);
- g_signal_connect(self->priv->vnc, "vnc-disconnected",
- G_CALLBACK(virt_viewer_session_vnc_disconnected), session);
+ g_signal_connect(self->priv->vnc, "vnc-connected",
+ G_CALLBACK(virt_viewer_session_vnc_connected), session);
+ g_signal_connect(self->priv->vnc, "vnc-initialized",
+ G_CALLBACK(virt_viewer_session_vnc_initialized), session);
+ g_signal_connect(self->priv->vnc, "vnc-disconnected",
+ G_CALLBACK(virt_viewer_session_vnc_disconnected), session);
- g_signal_connect(self->priv->vnc, "vnc-bell",
- G_CALLBACK(virt_viewer_session_vnc_bell), session);
- g_signal_connect(self->priv->vnc, "vnc-auth-failure",
- G_CALLBACK(virt_viewer_session_vnc_auth_failure), session);
- g_signal_connect(self->priv->vnc, "vnc-auth-unsupported",
- G_CALLBACK(virt_viewer_session_vnc_auth_unsupported), session);
- g_signal_connect(self->priv->vnc, "vnc-server-cut-text",
- G_CALLBACK(virt_viewer_session_vnc_cut_text), session);
+ g_signal_connect(self->priv->vnc, "vnc-bell",
+ G_CALLBACK(virt_viewer_session_vnc_bell), session);
+ g_signal_connect(self->priv->vnc, "vnc-auth-failure",
+ G_CALLBACK(virt_viewer_session_vnc_auth_failure), session);
+ g_signal_connect(self->priv->vnc, "vnc-auth-unsupported",
+ G_CALLBACK(virt_viewer_session_vnc_auth_unsupported), session);
+ g_signal_connect(self->priv->vnc, "vnc-server-cut-text",
+ G_CALLBACK(virt_viewer_session_vnc_cut_text), session);
- g_signal_connect(self->priv->vnc, "vnc-auth-credential",
- G_CALLBACK(virt_viewer_auth_vnc_credentials), NULL);
+ g_signal_connect(self->priv->vnc, "vnc-auth-credential",
+ G_CALLBACK(virt_viewer_auth_vnc_credentials), NULL);
- }
+}
VirtViewerSession *
virt_viewer_session_vnc_new(void)
{
- VirtViewerSessionVnc *session;
+ VirtViewerSessionVnc *session;
- session = g_object_new(VIRT_VIEWER_TYPE_SESSION_VNC, NULL);
+ session = g_object_new(VIRT_VIEWER_TYPE_SESSION_VNC, NULL);
- session->priv->vnc = VNC_DISPLAY(vnc_display_new());
+ session->priv->vnc = VNC_DISPLAY(vnc_display_new());
- g_signal_connect(session->priv->vnc, "vnc-connected",
- G_CALLBACK(virt_viewer_session_vnc_connected), session);
- g_signal_connect(session->priv->vnc, "vnc-initialized",
- G_CALLBACK(virt_viewer_session_vnc_initialized), session);
- g_signal_connect(session->priv->vnc, "vnc-disconnected",
- G_CALLBACK(virt_viewer_session_vnc_disconnected), session);
+ g_signal_connect(session->priv->vnc, "vnc-connected",
+ G_CALLBACK(virt_viewer_session_vnc_connected), session);
+ g_signal_connect(session->priv->vnc, "vnc-initialized",
+ G_CALLBACK(virt_viewer_session_vnc_initialized), session);
+ g_signal_connect(session->priv->vnc, "vnc-disconnected",
+ G_CALLBACK(virt_viewer_session_vnc_disconnected), session);
- g_signal_connect(session->priv->vnc, "vnc-bell",
- G_CALLBACK(virt_viewer_session_vnc_bell), session);
- g_signal_connect(session->priv->vnc, "vnc-auth-failure",
- G_CALLBACK(virt_viewer_session_vnc_auth_failure), session);
- g_signal_connect(session->priv->vnc, "vnc-auth-unsupported",
- G_CALLBACK(virt_viewer_session_vnc_auth_unsupported), session);
- g_signal_connect(session->priv->vnc, "vnc-server-cut-text",
- G_CALLBACK(virt_viewer_session_vnc_cut_text), session);
+ g_signal_connect(session->priv->vnc, "vnc-bell",
+ G_CALLBACK(virt_viewer_session_vnc_bell), session);
+ g_signal_connect(session->priv->vnc, "vnc-auth-failure",
+ G_CALLBACK(virt_viewer_session_vnc_auth_failure), session);
+ g_signal_connect(session->priv->vnc, "vnc-auth-unsupported",
+ G_CALLBACK(virt_viewer_session_vnc_auth_unsupported), session);
+ g_signal_connect(session->priv->vnc, "vnc-server-cut-text",
+ G_CALLBACK(virt_viewer_session_vnc_cut_text), session);
- g_signal_connect(session->priv->vnc, "vnc-auth-credential",
- G_CALLBACK(virt_viewer_auth_vnc_credentials), NULL);
+ g_signal_connect(session->priv->vnc, "vnc-auth-credential",
+ G_CALLBACK(virt_viewer_auth_vnc_credentials), NULL);
- return VIRT_VIEWER_SESSION(session);
+ return VIRT_VIEWER_SESSION(session);
}
-
-
-
/*
* Local variables:
- * c-indent-level: 8
- * c-basic-offset: 8
- * tab-width: 8
+ * c-indent-level: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
* End:
*/