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

40 lines
1.1 KiB
Diff

Index: calendar/backends/file/e-cal-backend-file.c
================================================================================
--- calendar/backends/file/e-cal-backend-file.c
+++ calendar/backends/file/e-cal-backend-file.c
@@ -129,6 +129,7 @@
GnomeVFSFileSize out;
gchar *tmp, *backup_uristr;
char *buf;
+ char *error = NULL;
ECalBackendFile *cbfile = user_data;
priv = cbfile->priv;
@@ -201,12 +202,14 @@
g_mutex_unlock (priv->idle_save_mutex);
e_cal_backend_notify_error (E_CAL_BACKEND (cbfile),
_("Cannot save calendar data: Malformed URI."));
- return TRUE;
+ return FALSE;
error:
g_mutex_unlock (priv->idle_save_mutex);
- 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);
+ return FALSE;
}
static void
@@ -520,8 +523,6 @@
g_assert (icalcomp != NULL);
icalcomponent_add_component (priv->icalcomp, icalcomp);
-
- save (cbfile);
}
}