3 files changed, 84 insertions, 25 deletions

diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c
index 4fd65904cc..2def3bb57b 100644
--- a/calendar/pcs/cal-backend-file.c
+++ b/calendar/pcs/cal-backend-file.c
@@ -282,11 +282,11 @@ static void
 save (CalBackendFile *cbfile)
 {
 	CalBackendFilePrivate *priv;
-	GnomeVFSURI *uri;
+	GnomeVFSURI *uri, *backup_uri;
 	GnomeVFSHandle *handle = NULL;
 	GnomeVFSResult result;
 	GnomeVFSFileSize out;
-	gchar *tmp;
+	gchar *tmp, *backup_uristr;
 	char *buf;
 	
 	priv = cbfile->priv;
@@ -297,43 +297,54 @@ save (CalBackendFile *cbfile)
 	if (!uri)
 		goto error;
 
-	/* Make a backup copy of the file if it exists */
+	/* save calendar to backup file */
 	tmp = gnome_vfs_uri_to_string (uri, GNOME_VFS_URI_HIDE_NONE);
-	if (tmp) {
-		GnomeVFSURI *backup_uri;
-		gchar *backup_uristr;
-		
-		backup_uristr = g_strconcat (tmp, "~", NULL);
-		backup_uri = gnome_vfs_uri_new (backup_uristr);
-		
-		result = gnome_vfs_move_uri (uri, backup_uri, TRUE);
-		gnome_vfs_uri_unref (backup_uri);
+	if (!tmp) {
+		gnome_vfs_uri_unref (uri);
+		goto error;
+	}
 		
-		g_free (tmp);
-		g_free (backup_uristr);
+	backup_uristr = g_strconcat (tmp, "~", NULL);
+	backup_uri = gnome_vfs_uri_new (backup_uristr);
+
+	g_free (tmp);
+	g_free (backup_uristr);
+
+	if (!backup_uri) {
+		gnome_vfs_uri_unref (uri);
+		goto error;
 	}
 	
-	/* Now write the new file out */
-	result = gnome_vfs_create_uri (&handle, uri, 
-				       GNOME_VFS_OPEN_WRITE,
-				       FALSE, 0666);
-	
-	if (result != GNOME_VFS_OK)
+	result = gnome_vfs_create_uri (&handle, backup_uri,
+                                       GNOME_VFS_OPEN_WRITE,
+                                       FALSE, 0666);
+	if (result != GNOME_VFS_OK) {
+		gnome_vfs_uri_unref (uri);
+		gnome_vfs_uri_unref (backup_uri);
 		goto error;
-	
+	}
+
 	buf = icalcomponent_as_ical_string (priv->icalcomp);
 	result = gnome_vfs_write (handle, buf, strlen (buf) * sizeof (char), &out);
-
-	if (result != GNOME_VFS_OK)
+	gnome_vfs_close (handle);
+	if (result != GNOME_VFS_OK) {
+		gnome_vfs_uri_unref (uri);
+		gnome_vfs_uri_unref (backup_uri);
 		goto error;
+	}
+
+	/* now copy the temporary file to the real file */
+	result = gnome_vfs_move_uri (backup_uri, uri, TRUE);
 
-	gnome_vfs_close (handle);
 	gnome_vfs_uri_unref (uri);
+	gnome_vfs_uri_unref (backup_uri);
+	if (result != GNOME_VFS_OK)
+		goto error;
 
 	return;
 	
  error:
-	g_warning ("Error writing calendar file.");
+	notify_error (cbfile, gnome_vfs_result_to_string (result));
 	return;
 }
 
@@ -1713,6 +1724,23 @@ notify_remove (CalBackendFile *cbfile, const char *uid)
 	}
 }
 
+/* Notifies a backend's clients that an error has occurred */
+static void
+notify_error (CalBackendFile *cbfile, const char *message)
+{
+	CalBackendFilePrivate *priv;
+	GList *l;
+
+	priv = cbfile->priv;
+
+	for (l = CAL_BACKEND (cbfile)->clients; l; l = l->next) {
+		Cal *cal;
+
+		cal = CAL (l->data);
+		cal_notify_error (cal, message);
+	}
+}
+
 /* Used from g_hash_table_foreach_remove(); removes and frees a category */
 static gboolean
 remove_category_cb (gpointer key, gpointer value, gpointer data)
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
index 60fcdc59ad..861cc47c89 100644
--- a/calendar/pcs/cal.c
+++ b/calendar/pcs/cal.c
@@ -874,6 +874,36 @@ cal_notify_remove (Cal *cal, const char *uid)
 }
 
 /**
+ * cal_notify_error
+ * @cal: A calendar client interface.
+ * @message: Error message.
+ *
+ * Notify a calendar client of an error occurred in the backend.
+ */
+void
+cal_notify_error (Cal *cal, const char *message)
+{
+	CalPrivate *priv;
+	CORBA_Environment ev;
+
+	g_return_if_fail (cal != NULL);
+	g_return_if_fail (IS_CAL (cal));
+	g_return_if_fail (message != NULL);
+
+	priv = cal->priv;
+	g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
+
+	CORBA_exception_init (&ev);
+	GNOME_Evolution_Calendar_Listener_notifyErrorOccurred (priv->listener, (char *) message, &ev);
+
+	if (BONOBO_EX (&ev))
+		g_message ("cal_notify_remove(): could not notify the listener "
+			   "about a removed object");
+
+	CORBA_exception_free (&ev);
+}
+
+/**
  * cal_notify_categories_changed:
  * @cal: A calendar client interface.
  * @categories: List of categories.
diff --git a/calendar/pcs/cal.h b/calendar/pcs/cal.h
index 9b6636b9d0..52889b4f9a 100644
--- a/calendar/pcs/cal.h
+++ b/calendar/pcs/cal.h
@@ -66,6 +66,7 @@ void cal_notify_mode (Cal *cal,
 		      GNOME_Evolution_Calendar_CalMode mode);
 void cal_notify_update (Cal *cal, const char *uid);
 void cal_notify_remove (Cal *cal, const char *uid);
+void cal_notify_error (Cal *cal, const char *message);
 
 void cal_notify_categories_changed (Cal *cal, GNOME_Evolution_Calendar_StringSeq *categories);