diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-10-20 09:08:29 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-10-20 09:08:29 +0000 |
| commit | 7f70ebcd67b7858803eddf87b765fbc264857f0c (patch) | |
| tree | fd228d0302fd1f664a2617cbcf88d4d058ac021e | |
| parent | 27aacd022bd01a805f470994f34a9605055c89ff (diff) | |
| download | gvfs-7f70ebcd67b7858803eddf87b765fbc264857f0c.tar.gz | |
Import from trunk:
2008-10-20 Alexander Larsson <alexl@redhat.com>
Import from trunk:
* client/gdaemonfileinputstream.c:
(run_sync_state_machine):
Revert debug spew from recent commit now that the core
issue is fixed (by the fuse race condition fix).
svn path=/branches/gnome-2-24/; revision=2064
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | client/gdaemonfileinputstream.c | 8 |
2 files changed, 10 insertions, 7 deletions
@@ -1,3 +1,12 @@ +2008-10-20 Alexander Larsson <alexl@redhat.com> + + Import from trunk: + + * client/gdaemonfileinputstream.c: + (run_sync_state_machine): + Revert debug spew from recent commit now that the core + issue is fixed (by the fuse race condition fix). + 2008-10-17 Hans Petter Jansson <hpj@novell.com> Import from trunk: diff --git a/client/gdaemonfileinputstream.c b/client/gdaemonfileinputstream.c index c6341a4f..8cdc3622 100644 --- a/client/gdaemonfileinputstream.c +++ b/client/gdaemonfileinputstream.c @@ -446,14 +446,8 @@ run_sync_state_machine (GDaemonFileInputStream *file, } else { - /* We got reports of this crashing with io_error NULL. That shouldn't - happen, so try to spew some debug info and avoid crashing. */ - if (io_error == NULL) - g_warning ("run_sync_state_machine got error but no GError set. This should not happen. io_op was: %d\n", - io_op); g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, - _("Error in stream protocol: %s"), - io_error ? io_error->message : "Unknown error"); + _("Error in stream protocol: %s"), io_error->message); g_error_free (io_error); return FALSE; } |