|
 |
59ad60 |
diff -up evolution-data-server-3.8.5/calendar/libecal/e-cal-client.c.memory-leaks evolution-data-server-3.8.5/calendar/libecal/e-cal-client.c
|
|
|
59ad60 |
--- evolution-data-server-3.8.5/calendar/libecal/e-cal-client.c.memory-leaks 2013-07-23 13:58:10.000000000 +0200
|
|
|
59ad60 |
+++ evolution-data-server-3.8.5/calendar/libecal/e-cal-client.c 2014-05-13 14:19:17.381979346 +0200
|
|
|
59ad60 |
@@ -4022,6 +4022,8 @@ e_cal_client_get_object_list_sync (ECalC
|
|
|
59ad60 |
|
|
|
59ad60 |
*out_icalcomps = g_slist_reverse (tmp);
|
|
|
59ad60 |
|
|
|
59ad60 |
+ g_strfreev (strv);
|
|
|
59ad60 |
+
|
|
|
59ad60 |
return TRUE;
|
|
|
59ad60 |
}
|
|
|
59ad60 |
|
|
|
59ad60 |
diff -up evolution-data-server-3.8.5/calendar/libecal/e-cal-component.c.memory-leaks evolution-data-server-3.8.5/calendar/libecal/e-cal-component.c
|
|
|
59ad60 |
--- evolution-data-server-3.8.5/calendar/libecal/e-cal-component.c.memory-leaks 2013-07-23 13:58:10.000000000 +0200
|
|
|
59ad60 |
+++ evolution-data-server-3.8.5/calendar/libecal/e-cal-component.c 2014-05-13 14:19:17.382979346 +0200
|
|
|
59ad60 |
@@ -4454,16 +4454,19 @@ set_alarm_description_cb (gpointer key,
|
|
|
59ad60 |
SetAlarmDescriptionData *sadd;
|
|
|
59ad60 |
gboolean changed = FALSE;
|
|
|
59ad60 |
const gchar *old_summary = NULL;
|
|
|
59ad60 |
+ gboolean free_description = FALSE;
|
|
|
59ad60 |
|
|
|
59ad60 |
alarm = value;
|
|
|
59ad60 |
sadd = user_data;
|
|
|
59ad60 |
|
|
|
59ad60 |
/* set the new description on the alarm */
|
|
|
59ad60 |
desc_prop = icalcomponent_get_first_property (alarm, ICAL_DESCRIPTION_PROPERTY);
|
|
|
59ad60 |
- if (desc_prop)
|
|
|
59ad60 |
+ if (desc_prop) {
|
|
|
59ad60 |
old_summary = icalproperty_get_description (desc_prop);
|
|
|
59ad60 |
- else
|
|
|
59ad60 |
+ } else {
|
|
|
59ad60 |
desc_prop = icalproperty_new_description (sadd->new_summary);
|
|
|
59ad60 |
+ free_description = TRUE;
|
|
|
59ad60 |
+ }
|
|
|
59ad60 |
|
|
|
59ad60 |
/* remove the X-EVOLUTION-NEEDS_DESCRIPTION property */
|
|
|
59ad60 |
icalprop = icalcomponent_get_first_property (alarm, ICAL_X_PROPERTY);
|
|
|
59ad60 |
@@ -4488,6 +4491,9 @@ set_alarm_description_cb (gpointer key,
|
|
|
59ad60 |
icalproperty_set_description (desc_prop, sadd->new_summary);
|
|
|
59ad60 |
}
|
|
|
59ad60 |
}
|
|
|
59ad60 |
+
|
|
|
59ad60 |
+ if (free_description)
|
|
|
59ad60 |
+ icalproperty_free (desc_prop);
|
|
|
59ad60 |
}
|
|
|
59ad60 |
|
|
|
59ad60 |
/**
|
|
|
59ad60 |
diff -up evolution-data-server-3.8.5/libedataserver/e-source-registry.c.memory-leaks evolution-data-server-3.8.5/libedataserver/e-source-registry.c
|
|
|
59ad60 |
--- evolution-data-server-3.8.5/libedataserver/e-source-registry.c.memory-leaks 2013-07-23 13:57:33.000000000 +0200
|
|
|
59ad60 |
+++ evolution-data-server-3.8.5/libedataserver/e-source-registry.c 2014-05-13 14:19:17.382979346 +0200
|
|
|
59ad60 |
@@ -3038,7 +3038,7 @@ e_source_registry_dup_unique_display_nam
|
|
|
59ad60 |
link = g_list_find (list, source);
|
|
|
59ad60 |
if (link != NULL) {
|
|
|
59ad60 |
g_object_unref (link->data);
|
|
|
59ad60 |
- list = g_list_remove_link (list, link);
|
|
|
59ad60 |
+ list = g_list_delete_link (list, link);
|
|
|
59ad60 |
}
|
|
|
59ad60 |
|
|
|
59ad60 |
/* Now find another source with a matching display name. */
|