Revision: 1395
http://geeqie.svn.sourceforge.net/geeqie/?rev=1395&view=rev
Author: nadvornik
Date: 2009-02-16 21:01:27 +0000 (Mon, 16 Feb 2009)
Log Message:
-----------
hopefully fixed a freeze on solaris
Modified Paths:
--------------
trunk/src/remote.c
Modified: trunk/src/remote.c
===================================================================
--- trunk/src/remote.c 2009-02-15 19:25:55 UTC (rev 1394)
+++ trunk/src/remote.c 2009-02-16 21:01:27 UTC (rev 1395)
@@ -60,6 +60,7 @@
{
RemoteClient *client = data;
RemoteConnection *rc;
+ GIOStatus status = G_IO_STATUS_NORMAL;
rc = client->rc;
@@ -71,7 +72,7 @@
GError *error = NULL;
guint termpos;
- while (g_io_channel_read_line(source, &buffer, NULL, &termpos,
&error) == G_IO_STATUS_NORMAL)
+ while ((status = g_io_channel_read_line(source, &buffer, NULL,
&termpos, &error)) == G_IO_STATUS_NORMAL)
{
if (buffer)
{
@@ -109,7 +110,7 @@
g_list_free(queue);
}
- if (condition & G_IO_HUP)
+ if (condition & G_IO_HUP || status == G_IO_STATUS_EOF || status ==
G_IO_STATUS_ERROR)
{
rc->clients = g_list_remove(rc->clients, client);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Geeqie-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/geeqie-svn
