gvfs r2064 - in branches/gnome-2-24: . client

[alexl svn gnome org]

Author: alexl
Date: Mon Oct 20 09:08:29 2008
New Revision: 2064
URL: http://svn.gnome.org/viewvc/gvfs?rev=2064&view=rev

Log:
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).




Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/client/gdaemonfileinputstream.c

Modified: branches/gnome-2-24/client/gdaemonfileinputstream.c
==============================================================================
--- branches/gnome-2-24/client/gdaemonfileinputstream.c	(original)
+++ branches/gnome-2-24/client/gdaemonfileinputstream.c	Mon Oct 20 09:08:29 2008
@@ -446,14 +446,8 @@
 	    }
 	  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;
 	    }