evolution-data-server r8497 - in trunk/calendar: . backends/file

[pchen svn gnome org]

Author: pchen
Date: Mon Feb 18 08:05:44 2008
New Revision: 8497
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8497&view=rev

Log:
2008-02-18  Chenthill Palanisamy  <pchenthill novell com>

        Fixes #163982 (bnc)
        * backends/file/e-cal-backend-file.c (save_file_when_idle),
        (add_component): Do not keep popuping up error dialogs in case
        of failure. Fix from opensuse downstream.



Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/backends/file/e-cal-backend-file.c

Modified: trunk/calendar/backends/file/e-cal-backend-file.c
==============================================================================
--- trunk/calendar/backends/file/e-cal-backend-file.c	(original)
+++ trunk/calendar/backends/file/e-cal-backend-file.c	Mon Feb 18 08:05:44 2008
@@ -128,6 +128,7 @@
 	GnomeVFSFileSize out;
 	gchar *tmp, *backup_uristr;
 	char *buf;
+	char *error = NULL;
 	ECalBackendFile *cbfile = user_data;
 
 	priv = cbfile->priv;
@@ -201,12 +202,15 @@
 	g_static_rec_mutex_unlock (&priv->idle_save_rmutex);
 	e_cal_backend_notify_error (E_CAL_BACKEND (cbfile),
 				  _("Cannot save calendar data: Malformed URI."));
-	return TRUE;
+	return FALSE;
 
  error:
 	g_static_rec_mutex_unlock (&priv->idle_save_rmutex);
-	e_cal_backend_notify_error (E_CAL_BACKEND (cbfile), gnome_vfs_result_to_string (result));
-	return TRUE;
+    /* error = g_strconcat (_("Can't save calendar data: "), gnome_vfs_result_to_string (result), NULL);
+    e_cal_backend_notify_error (E_CAL_BACKEND (cbfile), error);
+    g_free (error);  */
+    e_cal_backend_notify_error (E_CAL_BACKEND (cbfile), gnome_vfs_result_to_string (result)); 
+	return FALSE;
 }
 
 static void
@@ -521,8 +525,6 @@
 		g_assert (icalcomp != NULL);
 
 		icalcomponent_add_component (priv->icalcomp, icalcomp);
-
-		save (cbfile);
 	}
 }