[evolution-kolab/gnome-3-8] Revert "ECalBackendKolab: workaround E-D-S issue with NULL *calobj"
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab/gnome-3-8] Revert "ECalBackendKolab: workaround E-D-S issue with NULL *calobj"
- Date: Tue, 16 Apr 2013 17:15:36 +0000 (UTC)
commit cc49259884315df981fd153cdc4ccff30c294019
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Tue Apr 16 14:37:22 2013 +0200
Revert "ECalBackendKolab: workaround E-D-S issue with NULL *calobj"
This reverts commit 0322bad5ba583a0ac395752362695afd124350e7.
A proposed fix in E-D-S frees us of the necessity to keep
around the workaround introduced with the reverted commit.
src/calendar/e-cal-backend-kolab.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-kolab.c b/src/calendar/e-cal-backend-kolab.c
index 92fe513..dfc43af 100644
--- a/src/calendar/e-cal-backend-kolab.c
+++ b/src/calendar/e-cal-backend-kolab.c
@@ -545,16 +545,12 @@ cal_backend_kolab_get_object (ECalBackendSync *backend,
if (tmp_err != NULL) {
kolab_util_calendar_err_to_edb_err (error, tmp_err, __func__, __LINE__);
g_error_free (tmp_err);
- /* workaround e_util_utf8_make_valid() segfaulting on NULL argument */
- *calobj = g_strdup ("");
return;
}
if (ecalcomp != NULL) {
*calobj = (gchar *) e_cal_component_get_as_string (ecalcomp);
g_object_unref (ecalcomp);
- } else
- /* workaround e_util_utf8_make_valid() segfaulting on NULL argument */
- *calobj = g_strdup ("");
+ }
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]