diff options
| author | Victor Toso <me@victortoso.com> | 2016-12-09 14:05:54 +0100 |
|---|---|---|
| committer | Victor Toso <me@victortoso.com> | 2016-12-19 18:38:20 +0100 |
| commit | af58f0bdcad75d45c20cc1913855053d76ecce1d (patch) | |
| tree | cce66140eaf5a9a1e091c19b0fb35b471b7ddf14 | |
| parent | 5e8c6ec814b36d76e217e7f8558dc6eb0ee7ecdf (diff) | |
Ignore warnings about unavailable function around webdav
We do an extra check in configure to enable webdav and build everything
with a PHODAV variable check.
The warnings below are false positive and can be ignored while we don't
bump the requirements.
giopipe.c:481:5: warning: ‘g_simple_io_stream_new’ is deprecated: Not
available before 2.44 [-Wdeprecated-declarations]
giopipe.c:482:5: warning: ‘g_simple_io_stream_new’ is deprecated: Not
available before 2.44 [-Wdeprecated-declarations]
channel-webdav.c:317:5: warning: ‘g_output_stream_write_all_finish’ is
deprecated: Not available before 2.44 [-Wdeprecated-declarations]
channel-webdav.c:339:9: warning: ‘g_output_stream_write_all_async’ is
deprecated: Not available before 2.44 [-Wdeprecated-declarations]
channel-webdav.c:375:5: warning: ‘g_inet_socket_address_new_from_string’
is deprecated: Not available before 2.40 [-Wdeprecated-declarations]
Signed-off-by: Victor Toso <victortoso@redhat.com>
Acked-by: Pavel Grunt <pgrunt@redhat.com>
| -rw-r--r-- | src/channel-webdav.c | 6 | ||||
| -rw-r--r-- | src/giopipe.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/channel-webdav.c b/src/channel-webdav.c index 4ecc769..8baf9ca 100644 --- a/src/channel-webdav.c +++ b/src/channel-webdav.c @@ -314,7 +314,9 @@ static void demux_to_client_cb(GObject *source, GAsyncResult *result, gpointer u gboolean fail; gsize size; +G_GNUC_BEGIN_IGNORE_DEPRECATIONS g_output_stream_write_all_finish(G_OUTPUT_STREAM(source), result, &size, &error); +G_GNUC_END_IGNORE_DEPRECATIONS if (error) { CHANNEL_DEBUG(client->self, "write failed: %s", error->message); @@ -336,9 +338,11 @@ static void demux_to_client(Client *client) CHANNEL_DEBUG(client->self, "pushing %"G_GSIZE_FORMAT" to client %p", size, client); if (size > 0) { +G_GNUC_BEGIN_IGNORE_DEPRECATIONS g_output_stream_write_all_async(g_io_stream_get_output_stream(client->pipe), c->demux.buf, size, G_PRIORITY_DEFAULT, c->cancellable, demux_to_client_cb, client); +G_GNUC_END_IGNORE_DEPRECATIONS return; } else { /* Nothing to write */ @@ -372,7 +376,9 @@ static void start_client(SpiceWebdavChannel *self) client->cancellable = g_cancellable_new(); spice_make_pipe(&client->pipe, &peer); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS addr = g_inet_socket_address_new_from_string ("127.0.0.1", 0); +G_GNUC_END_IGNORE_DEPRECATIONS if (!soup_server_accept_iostream(server, peer, addr, addr, &error)) goto fail; diff --git a/src/giopipe.c b/src/giopipe.c index e76090c..08aea9a 100644 --- a/src/giopipe.c +++ b/src/giopipe.c @@ -478,8 +478,10 @@ spice_make_pipe(GIOStream **p1, GIOStream **p2) make_gio_pipe(&in1, &out2); make_gio_pipe(&in2, &out1); +G_GNUC_BEGIN_IGNORE_DEPRECATIONS *p1 = g_simple_io_stream_new(in1, out1); *p2 = g_simple_io_stream_new(in2, out2); +G_GNUC_END_IGNORE_DEPRECATIONS g_object_unref(in1); g_object_unref(in2); |