gedit r6456 - in trunk: . gedit

[jessevdk svn gnome org]

Author: jessevdk
Date: Tue Aug 26 14:23:50 2008
New Revision: 6456
URL: http://svn.gnome.org/viewvc/gedit?rev=6456&view=rev

Log:
	* gedit/gedit-gio-document-loader.c:
	* gedit/gedit-io-error-message-area:
	* gedit/gedit-gio-document-loader.c:
	
	Fixed error propagation and error handling of gio errors


Modified:
   trunk/ChangeLog
   trunk/gedit/gedit-gio-document-loader.c
   trunk/gedit/gedit-gio-document-saver.c
   trunk/gedit/gedit-io-error-message-area.c

Modified: trunk/gedit/gedit-gio-document-loader.c
==============================================================================
--- trunk/gedit/gedit-gio-document-loader.c	(original)
+++ trunk/gedit/gedit-gio-document-loader.c	Tue Aug 26 14:23:50 2008
@@ -192,8 +192,6 @@
 async_failed (AsyncData *async, GError *error)
 {
 	g_propagate_error (&async->loader->priv->error, error);
-	g_error_free (error);
-
 	remote_load_completed_or_failed (async->loader, async);
 }
 
@@ -478,7 +476,6 @@
 					       TRUE,
 					       gvloader->priv->error);
 
-		g_error_free (error);
 		async_data_free (async);
 	}
 	else

Modified: trunk/gedit/gedit-gio-document-saver.c
==============================================================================
--- trunk/gedit/gedit-gio-document-saver.c	(original)
+++ trunk/gedit/gedit-gio-document-saver.c	Tue Aug 26 14:23:50 2008
@@ -174,7 +174,6 @@
 	      GError    *error)
 {
 	g_propagate_error (&async->saver->priv->error, error);
-	g_error_free (error);
 	
 	remote_save_completed_or_failed (async->saver, async);
 }
@@ -237,7 +236,6 @@
 	{
 		gedit_debug_message (DEBUG_SAVER, "Query info failed: %s", error->message);
 		g_propagate_error (&saver->priv->error, error);
-		g_error_free (error);
 	}
 
 	remote_save_completed_or_failed (saver, async);
@@ -294,7 +292,6 @@
 	if (!g_output_stream_close_finish (stream, res, &error))
 	{
 		g_propagate_error (&async->saver->priv->error, error);
-		g_error_free (error);
 	}
 
 	remote_save_completed_or_failed (async->saver, async);
@@ -340,7 +337,6 @@
 		{
 			gedit_debug_message (DEBUG_SAVER, "Query info failed: %s", error->message);
 			g_propagate_error (&saver->priv->error, error);
-			g_error_free (error);
 
 			next_callback = (GAsyncReadyCallback) close_async_ready_cb;
 		}

Modified: trunk/gedit/gedit-io-error-message-area.c
==============================================================================
--- trunk/gedit/gedit-io-error-message-area.c	(original)
+++ trunk/gedit/gedit-io-error-message-area.c	Tue Aug 26 14:23:50 2008
@@ -348,7 +348,8 @@
 
 	g_return_val_if_fail (uri != NULL, NULL);
 	g_return_val_if_fail (error != NULL, NULL);
-	g_return_val_if_fail (error->domain == GEDIT_DOCUMENT_ERROR, NULL);
+	g_return_val_if_fail ((error->domain == GEDIT_DOCUMENT_ERROR) || 
+			      (error->domain == G_IO_ERROR), NULL);
 
 	full_formatted_uri = gedit_utils_uri_for_display (uri);
 
@@ -411,7 +412,8 @@
 
 	g_return_val_if_fail (uri != NULL, NULL);
 	g_return_val_if_fail (error != NULL, NULL);
-	g_return_val_if_fail (error->domain == GEDIT_DOCUMENT_ERROR, NULL);
+	g_return_val_if_fail ((error->domain == GEDIT_DOCUMENT_ERROR) || 
+			      (error->domain == G_IO_ERROR), NULL);
 
 	full_formatted_uri = gedit_utils_uri_for_display (uri);
 
@@ -988,7 +990,8 @@
 
 	g_return_val_if_fail (uri != NULL, NULL);
 	g_return_val_if_fail (error != NULL, NULL);
-	g_return_val_if_fail (error->domain == GEDIT_DOCUMENT_ERROR, NULL);
+	g_return_val_if_fail ((error->domain == GEDIT_DOCUMENT_ERROR) || 
+			      (error->domain == G_IO_ERROR), NULL);
 
 	full_formatted_uri = gedit_utils_uri_for_display (uri);