Attachment 291862 Details for Bug 358491 – proposed evo patch

[patch] proposed evo patch

evo.patch (text/plain), 4.20 KB, created by Milan Crha on 2008-01-16 16:06:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Crha

Created: 2008-01-16 16:06:08 UTC

Size: 4.20 KB

patch

obsolete

>Index: calendar/gui/dialogs/comp-editor.c
>===================================================================
>--- calendar/gui/dialogs/comp-editor.c	(revision 34837)
>+++ calendar/gui/dialogs/comp-editor.c	(working copy)
>@@ -2590,7 +2590,7 @@
> real_send_comp (CompEditor *editor, ECalComponentItipMethod method)
> {
> 	CompEditorPrivate *priv;
>-	ECalComponent *send_comp;
>+	ECalComponent *send_comp = NULL;
> 	char *address = NULL;
> 	GList *users = NULL;
> 
>@@ -2599,8 +2599,25 @@
> 
> 	priv = editor->priv;
> 
>-	send_comp = e_cal_component_clone (priv->comp);
>+	if (priv->mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (priv->comp)) {
>+		/* Ensure we send the master object, not the instance only */
>+		icalcomponent *icalcomp = NULL;
>+		const char *uid = NULL;
> 
>+		e_cal_component_get_uid (priv->comp, &uid);
>+		if (e_cal_get_object (priv->client, uid, NULL, &icalcomp, NULL) && icalcomp) {
>+			send_comp = e_cal_component_new ();
>+			if (!e_cal_component_set_icalcomponent (send_comp, icalcomp)) {
>+				g_object_unref (icalcomp);
>+				g_object_unref (send_comp);
>+				send_comp = NULL;
>+			}
>+		}
>+	}
>+
>+	if (!send_comp)
>+		send_comp = e_cal_component_clone (priv->comp);
>+
> 	if (e_cal_component_get_vtype (send_comp) == E_CAL_COMPONENT_JOURNAL)
> 		get_users_from_memo_comp (send_comp, &users);
> 
>Index: calendar/gui/e-calendar-view.c
>===================================================================
>--- calendar/gui/e-calendar-view.c	(revision 34837)
>+++ calendar/gui/e-calendar-view.c	(working copy)
>@@ -2041,8 +2041,30 @@
> {
> 	if (e_cal_modify_object (client, e_cal_component_get_icalcomponent (comp), mod, NULL)) {
> 		if ((itip_organizer_is_user (comp, client) || itip_sentby_is_user (comp)) &&
>-		    send_component_dialog (toplevel, client, comp, new))
>-			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp, client, NULL, NULL, NULL);
>+		    send_component_dialog (toplevel, client, comp, new)) {
>+			ECalComponent *send_comp = NULL;
>+
>+			if (mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (comp)) {
>+				/* Ensure we send the master object, not the instance only */
>+				icalcomponent *icalcomp = NULL;
>+				const char *uid = NULL;
>+
>+				e_cal_component_get_uid (comp, &uid);
>+				if (e_cal_get_object (client, uid, NULL, &icalcomp, NULL) && icalcomp) {
>+					send_comp = e_cal_component_new ();
>+					if (!e_cal_component_set_icalcomponent (send_comp, icalcomp)) {
>+						g_object_unref (icalcomp);
>+						g_object_unref (send_comp);
>+						send_comp = NULL;
>+					}
>+				}
>+			}
>+
>+			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, send_comp ? send_comp : comp, client, NULL, NULL, NULL);
>+
>+			if (send_comp)
>+				g_object_unref (send_comp);
>+		}
> 	} else {
> 		g_message (G_STRLOC ": Could not update the object!");
> 	}
>Index: calendar/gui/e-cal-model-calendar.c
>===================================================================
>--- calendar/gui/e-cal-model-calendar.c	(revision 34837)
>+++ calendar/gui/e-cal-model-calendar.c	(working copy)
>@@ -377,11 +377,33 @@
> 		break;
> 	}
> 
>-	if (e_cal_modify_object (comp_data->client, comp_data->icalcomp, CALOBJ_MOD_ALL, NULL)) {
>+	if (e_cal_modify_object (comp_data->client, comp_data->icalcomp, mod, NULL)) {
> 		if (itip_organizer_is_user (comp, comp_data->client) &&
>-		    send_component_dialog (NULL, comp_data->client, comp, FALSE))
>-			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, comp,
>+		    send_component_dialog (NULL, comp_data->client, comp, FALSE)) {
>+			ECalComponent *send_comp = NULL;
>+
>+			if (mod == CALOBJ_MOD_ALL && e_cal_component_is_instance (comp)) {
>+				/* Ensure we send the master object, not the instance only */
>+				icalcomponent *icalcomp = NULL;
>+				const char *uid = NULL;
>+
>+				e_cal_component_get_uid (comp, &uid);
>+				if (e_cal_get_object (comp_data->client, uid, NULL, &icalcomp, NULL) && icalcomp) {
>+					send_comp = e_cal_component_new ();
>+					if (!e_cal_component_set_icalcomponent (send_comp, icalcomp)) {
>+						g_object_unref (icalcomp);
>+						g_object_unref (send_comp);
>+						send_comp = NULL;
>+					}
>+				}
>+			}
>+
>+			itip_send_comp (E_CAL_COMPONENT_METHOD_REQUEST, send_comp ? send_comp : comp,
> 					comp_data->client, NULL, NULL, NULL);
>+
>+			if (send_comp)
>+				g_object_unref (send_comp);
>+		}
> 	} else {
> 		g_warning (G_STRLOC ": Could not modify the object!");
>

Actions: View | Diff

Attachments on bug 358491: 291862