callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Calendar - do not close editor after error

Browse Source 
** Fix for bug #573704
This commit is contained in:
Milan Crha
2009-04-24 20:53:03 +02:00
committed by Matthew Barnes
parent 8ea80f62e5
commit d36734fb44
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/ChangeLog
View File

@ -1,3 +1,10 @@
2009-04-24 Milan Crha <mcrha@redhat.com>
** Fix for bug #573704
* gui/dialogs/comp-editor.c: (action_save_cb), (real_send_comp):
Do not close editor after error.
2009-04-24 Milan Crha <mcrha@redhat.com>
** Part of fix for bug #571272

20
calendar/gui/dialogs/comp-editor.c
View File

@ -890,9 +890,11 @@ action_save_cb (GtkAction *action,
g_clear_error (&error);
}
}
} else
correct = FALSE;
close_dialog (editor);
if (correct)
close_dialog (editor);
}
static void
@ -2505,14 +2507,13 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str
set_attendees_for_delegation (send_comp, address, method);
}
if (!e_cal_component_has_attachments (priv->comp)
|| e_cal_get_static_capability (priv->client, CAL_STATIC_CAPABILITY_CREATE_MESSAGES)) {
if (!e_cal_component_has_attachments (priv->comp)
|| e_cal_get_static_capability (priv->client, CAL_STATIC_CAPABILITY_CREATE_MESSAGES)) {
if (itip_send_comp (method, send_comp, priv->client,
NULL, NULL, users, strip_alarms)) {
g_object_unref (send_comp);
return TRUE;
}
} else {
/* Clone the component with attachments set to CID:... */
int num_attachments, i;
@ -2530,9 +2531,14 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str
mime_attach_list = comp_editor_get_mime_attach_list (editor);
if (itip_send_comp (method, send_comp, priv->client,
NULL, mime_attach_list, users, strip_alarms)) {
save_comp (editor);
gboolean saved = save_comp (editor);
g_object_unref (send_comp);
return TRUE;
if (!saved)
comp_editor_set_changed (editor, TRUE);
return saved;
}
}