diff options
| author | Rodrigo Moya <rodrigo@src.gnome.org> | 2003-08-08 00:38:20 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@src.gnome.org> | 2003-08-08 00:38:20 +0800 |
| commit | dc84df9871b3171a21d62feec988160f3c608103 (patch) | |
| tree | 29f8dfbfa57dc43ae07fe645a1664fc5b1222086 /calendar/gui/dialogs | |
| parent | 64222beb23056f789551b79e78fa721d32408e9e (diff) | |
| download | gsoc2013-evolution-dc84df9871b3171a21d62feec988160f3c608103.tar.gz gsoc2013-evolution-dc84df9871b3171a21d62feec988160f3c608103.tar.zst gsoc2013-evolution-dc84df9871b3171a21d62feec988160f3c608103.zip | |
Merge new-calendar-branch into HEAD
svn path=/trunk/; revision=22129
Diffstat (limited to 'calendar/gui/dialogs')
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 62612975d2..1b3afd118b 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -1450,9 +1450,21 @@ obj_updated_cb (CalClient *client, const char *uid, gpointer data) if (!strcmp (uid, edit_uid) && !priv->updating) { if (changed_component_dialog ((GtkWindow *) editor, priv->comp, FALSE, priv->changed)) { - status = cal_client_get_object (priv->client, uid, &comp); + icalcomponent *icalcomp; + + status = cal_client_get_object (priv->client, uid, &icalcomp); if (status == CAL_CLIENT_GET_SUCCESS) { - comp_editor_edit_comp (editor, comp); + comp = cal_component_new (); + if (cal_component_set_icalcomponent (comp, icalcomp)) + comp_editor_edit_comp (editor, comp); + else { + GtkWidget *dlg; + + dlg = gnome_error_dialog (_("Unable to obtain current version!")); + gnome_dialog_run_and_close (GNOME_DIALOG (dlg)); + icalcomponent_free (icalcomp); + } + g_object_unref((comp)); } else { GtkWidget *dlg; |