gedit r6901 - in trunk: . gedit

[pborelli svn gnome org]

Author: pborelli
Date: Mon Feb 16 17:41:31 2009
New Revision: 6901
URL: http://svn.gnome.org/viewvc/gedit?rev=6901&view=rev

Log:
2009-02-16  Paolo Borelli  <pborelli katamail com>

	* gedit/gedit-tab.c:
	* gedit/gedit-io-error-message-area.c:
	Handle G_IO_ERROR_CANT_CREATE_BACKUP



Modified:
   trunk/ChangeLog
   trunk/gedit/gedit-io-error-message-area.c
   trunk/gedit/gedit-tab.c

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	Mon Feb 16 17:41:31 2009
@@ -894,8 +894,10 @@
 
 	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->code == GEDIT_DOCUMENT_ERROR_CANT_CREATE_BACKUP, NULL);
+	g_return_val_if_fail (((error->domain == GEDIT_DOCUMENT_ERROR &&
+			        error->code == GEDIT_DOCUMENT_ERROR_CANT_CREATE_BACKUP) ||
+			       (error->domain == G_IO_ERROR &&
+			        error->code == G_IO_ERROR_CANT_CREATE_BACKUP)), NULL);
 
 	full_formatted_uri = gedit_utils_uri_for_display (uri);
 

Modified: trunk/gedit/gedit-tab.c
==============================================================================
--- trunk/gedit/gedit-tab.c	(original)
+++ trunk/gedit/gedit-tab.c	Mon Feb 16 17:41:31 2009
@@ -1318,8 +1318,10 @@
 					  G_CALLBACK (externally_modified_error_message_area_response),
 					  tab);
 		}
-		else if (error->domain == GEDIT_DOCUMENT_ERROR &&
-			 error->code == GEDIT_DOCUMENT_ERROR_CANT_CREATE_BACKUP)
+		else if ((error->domain == GEDIT_DOCUMENT_ERROR &&
+			  error->code == GEDIT_DOCUMENT_ERROR_CANT_CREATE_BACKUP) ||
+		         (error->domain == G_IO_ERROR &&
+			  error->code == G_IO_ERROR_CANT_CREATE_BACKUP))
 		{
 			/* This error is recoverable */
 			emsg = gedit_no_backup_saving_error_message_area_new (