pxcloud/spice-gtk
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice-gtk synced 2026-02-05 14:22:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a few warnings on windows build

Browse Source
This commit is contained in:
Marc-André Lureau 2012-02-29 14:55:32 +01:00
parent 161c0fc6b0
commit c10b36855c
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/controller/namedpipelistener.c
View File

@ -39,7 +39,7 @@ spice_named_pipe_listener_dispose (GObject *object)
SpiceNamedPipeListener *listener = SPICE_NAMED_PIPE_LISTENER (object);
SpiceNamedPipe *p;
while (p = g_queue_pop_head (&listener->priv->namedpipes))
while ((p = g_queue_pop_head (&listener->priv->namedpipes)) != NULL)
g_object_unref (p);
g_return_if_fail (g_queue_get_length (&listener->priv->namedpipes) == 0);
@ -239,7 +239,6 @@ spice_named_pipe_listener_accept_finish (SpiceNamedPipeListener *listener,
GSimpleAsyncResult *simple;
ConnectData *c;
SpiceNamedPipeConnection *connection;
gboolean success;
g_return_val_if_fail (SPICE_IS_NAMED_PIPE_LISTENER (listener), NULL);
g_return_val_if_fail (G_IS_SIMPLE_ASYNC_RESULT (result), NULL);

14
gtk/controller/spice-controller-listener.c
View File

@ -63,7 +63,7 @@ spice_controller_listener_new (const gchar *address, GError **error)
if (addr == NULL)
addr = g_strdup (g_getenv ("SPICE_XPI_NAMEDPIPE"));
if (addr == NULL)
addr = g_strdup_printf ("\\\\.\\pipe\\SpiceController-%lu", GetCurrentProcessId ());
addr = g_strdup_printf ("\\\\.\\pipe\\SpiceController-%" G_GUINT64_FORMAT, (guint64)GetCurrentProcessId ());
#else
if (addr == NULL)
addr = g_strdup (g_getenv ("SPICE_XPI_SOCKET"));
@ -142,8 +142,16 @@ spice_controller_listener_accept_finish (GObject *listener,
g_return_val_if_fail(G_IS_OBJECT(listener), NULL);
#ifdef G_OS_WIN32
spice_named_pipe_listener_accept_finish (SPICE_NAMED_PIPE_LISTENER (listener), result, source_object, error);
SpiceNamedPipeConnection *np;
np = spice_named_pipe_listener_accept_finish (SPICE_NAMED_PIPE_LISTENER (listener), result, source_object, error);
if (np)
return G_IO_STREAM (np);
#else
g_socket_listener_accept_finish (G_SOCKET_LISTENER (listener), result, source_object, error);
GSocketConnection *socket;
socket = g_socket_listener_accept_finish (G_SOCKET_LISTENER (listener), result, source_object, error);
if (socket)
return G_IO_STREAM (socket);
#endif
return NULL;
}