aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/gui/e-meeting-edit.c14
2 files changed, 14 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 558cb4c66f..fba05f84cf 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-09 Jesse Pavel <jpavel@helixcode.com>
+
+ * gui/e-meeting-edit.c: fixed a bug that would make the calendar segfault
+ if the meeting editor were called up twice without first saving the
+ component.
+
2000-11-08 Jesse Pavel <jpavel@helixcode.com>
* gui/e-itip-control.c, gui/e-itip-control.glade: updated the GUI
diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c
index 142e916997..cf1cffee52 100644
--- a/calendar/gui/e-meeting-edit.c
+++ b/calendar/gui/e-meeting-edit.c
@@ -141,12 +141,14 @@ window_delete_cb (GtkWidget *widget,
/* FIXME: notify the event editor that our data has changed.
For now, I'll just display a dialog box. */
{
- GtkWidget *dialog;
-
- dialog = gnome_warning_dialog_parented ("Note that the meeting has changed,\n"
- "and you should save this event.",
- GTK_WINDOW (priv->meeting_window));
- gnome_dialog_run (GNOME_DIALOG(dialog));
+ if (!cal_client_update_object (priv->client, priv->comp)) {
+ GtkWidget *dialog;
+
+ dialog = gnome_warning_dialog_parented ("I couldn't automatically save this meeting,\n"
+ "so try to save this event manually.",
+ GTK_WINDOW (priv->meeting_window));
+ gnome_dialog_run (GNOME_DIALOG(dialog));
+ }
}
}