evolution-data-server/bnc-163982-system-hang-with-126-error-popups.patch

41 lines
1.3 KiB
Diff

Index: calendar/backends/file/e-cal-backend-file.c
===================================================================
--- calendar/backends/file/e-cal-backend-file.c.orig
+++ calendar/backends/file/e-cal-backend-file.c
@@ -134,6 +134,7 @@ save_file_when_idle (gpointer user_data)
GnomeVFSFileSize out;
gchar *tmp, *backup_uristr;
char *buf;
+ char *error = NULL;
ECalBackendFile *cbfile = user_data;
priv = cbfile->priv;
@@ -206,12 +207,15 @@ save_file_when_idle (gpointer user_data)
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
@@ -526,8 +530,6 @@ add_component (ECalBackendFile *cbfile,
g_assert (icalcomp != NULL);
icalcomponent_add_component (priv->icalcomp, icalcomp);
-
- save (cbfile);
}
}