diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2011-05-12 09:49:39 +0200 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2011-05-12 09:49:39 +0200 |
| commit | 311dd4f3208e0ba4a5c33e08c5352f7d3db25c73 (patch) | |
| tree | 9323f1a879a2c0951778f4785783518d554ed6d0 | |
| parent | a7ea7f52f4c759c55a2f76d3b96c6a4ab71b7db9 (diff) | |
Fix make distcheckssh-contact-0.6
| -rw-r--r-- | src/vinagre/Makefile.am | 1 | ||||
| -rw-r--r-- | src/vinagre/tab.c | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/vinagre/Makefile.am b/src/vinagre/Makefile.am index 5845572..7456724 100644 --- a/src/vinagre/Makefile.am +++ b/src/vinagre/Makefile.am @@ -20,7 +20,6 @@ libssh_contact_la_SOURCES = \ tab.h tab.c \ tree-view.h tree-view.c \ ../client-helpers.h ../client-helpers.c \ - ../common.h ../common.c \ $(NULL) plugin_in_files = ssh-contact.vinagre-plugin.desktop.in diff --git a/src/vinagre/tab.c b/src/vinagre/tab.c index 0d9470b..0465f8a 100644 --- a/src/vinagre/tab.c +++ b/src/vinagre/tab.c @@ -30,7 +30,6 @@ #include "tab.h" #include "connection.h" #include "../client-helpers.h" -#include "../common.h" struct _SshContactTabPrivate { @@ -144,7 +143,7 @@ splice_cb (GObject *source_object, SshContactTab *self = user_data; GError *error = NULL; - if (!_g_io_stream_splice_finish (res, &error)) + if (!g_io_stream_splice_finish (res, &error)) throw_error (self, error); else leave (self); @@ -174,8 +173,8 @@ ssh_socket_connected_cb (GObject *source_object, self->priv->connected = TRUE; /* Splice tube and ssh connections */ - _g_io_stream_splice_async (G_IO_STREAM (self->priv->tube_connection), - G_IO_STREAM (self->priv->ssh_connection), _G_IO_STREAM_SPLICE_NONE, + g_io_stream_splice_async (G_IO_STREAM (self->priv->tube_connection), + G_IO_STREAM (self->priv->ssh_connection), G_IO_STREAM_SPLICE_NONE, G_PRIORITY_DEFAULT, NULL, splice_cb, self); } |