|
 |
5d780a |
diff -up evolution-3.28.5/src/calendar/gui/e-comp-editor.c.crash-empty-attendee evolution-3.28.5/src/calendar/gui/e-comp-editor.c
|
|
|
5d780a |
--- evolution-3.28.5/src/calendar/gui/e-comp-editor.c.crash-empty-attendee 2018-07-30 15:37:05.000000000 +0200
|
|
|
5d780a |
+++ evolution-3.28.5/src/calendar/gui/e-comp-editor.c 2019-06-28 11:36:27.645365528 +0200
|
|
|
5d780a |
@@ -2610,6 +2610,7 @@ e_comp_editor_fill_component (ECompEdito
|
|
|
5d780a |
icalcomponent *component)
|
|
|
5d780a |
{
|
|
|
5d780a |
ECompEditorClass *comp_editor_class;
|
|
|
5d780a |
+ GtkWidget *focused_widget;
|
|
|
5d780a |
gboolean is_valid;
|
|
|
5d780a |
|
|
|
5d780a |
g_return_val_if_fail (E_IS_COMP_EDITOR (comp_editor), FALSE);
|
|
|
5d780a |
@@ -2619,8 +2620,30 @@ e_comp_editor_fill_component (ECompEdito
|
|
|
5d780a |
g_return_val_if_fail (comp_editor_class != NULL, FALSE);
|
|
|
5d780a |
g_return_val_if_fail (comp_editor_class->fill_component != NULL, FALSE);
|
|
|
5d780a |
|
|
|
5d780a |
+ focused_widget = gtk_window_get_focus (GTK_WINDOW (comp_editor));
|
|
|
5d780a |
+ if (focused_widget) {
|
|
|
5d780a |
+ GtkWidget *parent, *ce_widget = GTK_WIDGET (comp_editor);
|
|
|
5d780a |
+
|
|
|
5d780a |
+ /* When a cell-renderer is focused and editing the cell content,
|
|
|
5d780a |
+ then unfocus it may mean to free the currently focused widget,
|
|
|
5d780a |
+ thus get the GtkTreeView in such cases. */
|
|
|
5d780a |
+ parent = focused_widget;
|
|
|
5d780a |
+ while (parent = gtk_widget_get_parent (parent), parent && parent != ce_widget) {
|
|
|
5d780a |
+ if (GTK_IS_TREE_VIEW (parent)) {
|
|
|
5d780a |
+ focused_widget = parent;
|
|
|
5d780a |
+ break;
|
|
|
5d780a |
+ }
|
|
|
5d780a |
+ }
|
|
|
5d780a |
+
|
|
|
5d780a |
+ /* Save any pending changes */
|
|
|
5d780a |
+ gtk_window_set_focus (GTK_WINDOW (comp_editor), NULL);
|
|
|
5d780a |
+ }
|
|
|
5d780a |
+
|
|
|
5d780a |
is_valid = comp_editor_class->fill_component (comp_editor, component);
|
|
|
5d780a |
|
|
|
5d780a |
+ if (focused_widget)
|
|
|
5d780a |
+ gtk_window_set_focus (GTK_WINDOW (comp_editor), focused_widget);
|
|
|
5d780a |
+
|
|
|
5d780a |
if (is_valid && comp_editor->priv->validation_alert) {
|
|
|
5d780a |
e_alert_response (comp_editor->priv->validation_alert, GTK_RESPONSE_CLOSE);
|
|
|
5d780a |
g_clear_object (&comp_editor->priv->validation_alert);
|
|
|
5d780a |
diff -up evolution-3.28.5/src/modules/calendar/e-cal-shell-content.c.crash-empty-attendee evolution-3.28.5/src/modules/calendar/e-cal-shell-content.c
|
|
|
5d780a |
--- evolution-3.28.5/src/modules/calendar/e-cal-shell-content.c.crash-empty-attendee 2018-07-30 15:37:05.000000000 +0200
|
|
|
5d780a |
+++ evolution-3.28.5/src/modules/calendar/e-cal-shell-content.c 2019-06-28 11:36:27.645365528 +0200
|
|
|
5d780a |
@@ -847,9 +847,9 @@ cal_shell_content_get_attendee_prop (ica
|
|
|
5d780a |
while (prop != NULL) {
|
|
|
5d780a |
const gchar *attendee;
|
|
|
5d780a |
|
|
|
5d780a |
- attendee = icalproperty_get_attendee (prop);
|
|
|
5d780a |
+ attendee = itip_strip_mailto (icalproperty_get_attendee (prop));
|
|
|
5d780a |
|
|
|
5d780a |
- if (g_str_equal (itip_strip_mailto (attendee), address))
|
|
|
5d780a |
+ if (attendee && g_ascii_strcasecmp (attendee, address) == 0)
|
|
|
5d780a |
return prop;
|
|
|
5d780a |
|
|
|
5d780a |
prop = icalcomponent_get_next_property (
|