diff options
| author |  keis <keijser@gmail.com> | 2011-01-05 00:41:46 +0100 |
|---|---|---|
| committer | keis <keijser@gmail.com> | 2011-01-05 02:11:09 +0100 |
| commit | 55ce375945db478c563ed3e04dd2db86049ed20e (patch) | |
| tree | 56dc24fefa73498370b9486b544f2b294f6c3aa5 /src | |
| parent | 597c1051c36a51bc730c9684a1a7a6d9535001cb (diff) | |
print the error message received
Diffstat (limited to 'src')
| -rw-r--r-- | src/uzbl-core.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/uzbl-core.c b/src/uzbl-core.c index c5e9832..c6813ea 100644 --- a/src/uzbl-core.c +++ b/src/uzbl-core.c @@ -1770,17 +1770,23 @@ control_client_socket(GIOChannel *clientchan) { ret = g_io_channel_read_line(clientchan, &ctl_line, &len, NULL, &error); if (ret == G_IO_STATUS_ERROR) { - g_warning ("Error reading: %s\n", error->message); - g_clear_error (&error); - remove_socket_from_array(clientchan); - g_io_channel_shutdown(clientchan, TRUE, &error); + g_warning ("Error reading: %s", error->message); g_clear_error (&error); + remove_socket_from_array (clientchan); + ret = g_io_channel_shutdown (clientchan, TRUE, &error); + if (ret == G_IO_STATUS_ERROR) { + g_warning ("Error closing: %s", error->message); + g_clear_error (&error); + } return FALSE; } else if (ret == G_IO_STATUS_EOF) { - remove_socket_from_array(clientchan); + remove_socket_from_array (clientchan); /* shutdown and remove channel watch from main loop */ - g_io_channel_shutdown(clientchan, TRUE, &error); - g_clear_error (&error); + ret = g_io_channel_shutdown (clientchan, TRUE, &error); + if (ret == G_IO_STATUS_ERROR) { + g_warning ("Error closing: %s", error->message); + g_clear_error (&error); + } return FALSE; } @@ -1793,8 +1799,10 @@ control_client_socket(GIOChannel *clientchan) { g_warning ("Error writing: %s", error->message); g_clear_error (&error); } - g_io_channel_flush(clientchan, &error); - g_clear_error (&error); + if (g_io_channel_flush(clientchan, &error) == G_IO_STATUS_ERROR) { + g_warning ("Error flushing: %s", error->message); + g_clear_error (&error); + } } g_string_free(result, TRUE); |