Attachment 889222 Details for Bug 1090816 – eds patch

[patch] eds patch

eds.patch (text/plain), 1.99 KB, created by Milan Crha on 2014-04-24 10:08:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Crha

Created: 2014-04-24 10:08:07 UTC

Size: 1.99 KB

patch

obsolete

>Index: calendar/libecal/e-cal-client.c
>===================================================================
>--- calendar/libecal/e-cal-client.c	(revision 7)
>+++ calendar/libecal/e-cal-client.c	(working copy)
>@@ -4022,6 +4022,8 @@ e_cal_client_get_object_list_sync (ECalClient *cli
> 
> 	*out_icalcomps = g_slist_reverse (tmp);
> 
>+	g_strfreev (strv);
>+
> 	return TRUE;
> }
> 
>Index: calendar/libecal/e-cal-component.c
>===================================================================
>--- calendar/libecal/e-cal-component.c	(revision 7)
>+++ calendar/libecal/e-cal-component.c	(working copy)
>@@ -4454,16 +4454,19 @@ set_alarm_description_cb (gpointer key,
> 	SetAlarmDescriptionData *sadd;
> 	gboolean changed = FALSE;
> 	const gchar *old_summary = NULL;
>+	gboolean free_description = FALSE;
> 
> 	alarm = value;
> 	sadd = user_data;
> 
> 	/* set the new description on the alarm */
> 	desc_prop = icalcomponent_get_first_property (alarm, ICAL_DESCRIPTION_PROPERTY);
>-	if (desc_prop)
>+	if (desc_prop) {
> 		old_summary = icalproperty_get_description (desc_prop);
>-	else
>+	} else {
> 		desc_prop = icalproperty_new_description (sadd->new_summary);
>+		free_description = TRUE;
>+	}
> 
> 	/* remove the X-EVOLUTION-NEEDS_DESCRIPTION property */
> 	icalprop = icalcomponent_get_first_property (alarm, ICAL_X_PROPERTY);
>@@ -4488,6 +4491,9 @@ set_alarm_description_cb (gpointer key,
> 			icalproperty_set_description (desc_prop, sadd->new_summary);
> 		}
> 	}
>+
>+	if (free_description)
>+		icalproperty_free (desc_prop);
> }
> 
> /**
>Index: libedataserver/e-source-registry.c
>===================================================================
>--- libedataserver/e-source-registry.c	(revision 7)
>+++ libedataserver/e-source-registry.c	(working copy)
>@@ -3038,7 +3038,7 @@ e_source_registry_dup_unique_display_name (ESource
> 	link = g_list_find (list, source);
> 	if (link != NULL) {
> 		g_object_unref (link->data);
>-		list = g_list_remove_link (list, link);
>+		list = g_list_delete_link (list, link);
> 	}
> 
> 	/* Now find another source with a matching display name. */

Actions: View | Diff

Attachments on bug 1090816: 889222