diff options
| author | Chenthill Palanisamy <pchen@src.gnome.org> | 2005-12-15 16:33:31 +0800 |
|---|---|---|
| committer | Chenthill Palanisamy <pchen@src.gnome.org> | 2005-12-15 16:33:31 +0800 |
| commit | 8757f8253d34267c81067d8b50b9d8a0b17bd32b (patch) | |
| tree | e1c247628bc61cfba6d7569ac53fd6a056ad5079 | |
| parent | 32f88d560f6f1789b4dd740327e8765c893e5970 (diff) | |
| download | gsoc2013-evolution-8757f8253d34267c81067d8b50b9d8a0b17bd32b.tar gsoc2013-evolution-8757f8253d34267c81067d8b50b9d8a0b17bd32b.tar.gz gsoc2013-evolution-8757f8253d34267c81067d8b50b9d8a0b17bd32b.tar.bz2 gsoc2013-evolution-8757f8253d34267c81067d8b50b9d8a0b17bd32b.tar.lz gsoc2013-evolution-8757f8253d34267c81067d8b50b9d8a0b17bd32b.tar.xz gsoc2013-evolution-8757f8253d34267c81067d8b50b9d8a0b17bd32b.tar.zst gsoc2013-evolution-8757f8253d34267c81067d8b50b9d8a0b17bd32b.zip | |
fixes #324058
svn path=/trunk/; revision=30782
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 23 |
2 files changed, 13 insertions, 18 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index c7666ac715..e51f85d5e1 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,13 @@ 2005-12-15 Chenthill Palanisamy <pchenthill@novell.com> + Fixes #324058 + * gui/dialogs/comp-editor.c: (key_press_event), + (editor_key_press_event), (real_send_comp): Removed the + obsolete code which caused the crash. Corrected an invalid type + cast. + +2005-12-15 Chenthill Palanisamy <pchenthill@novell.com> + Fixes #321739 * gui/dialogs/event-page.c: (event_page_fill_widgets), (remove_attendee): Add/remove attendee from e-name-selector also. diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index aff3bb6b46..ba99ce60f4 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -1159,7 +1159,8 @@ button_press_event (GtkWidget *widget, GdkEventButton *event) static gint key_press_event(GtkWidget *widget, GdkEventKey *event) { - EAttachmentBar *bar = E_ATTACHMENT_BAR (widget); + CompEditor *Editor = COMP_EDITOR (widget); + EAttachmentBar *bar = E_ATTACHMENT_BAR (Editor->priv->attachment_bar); if (event->keyval == GDK_Delete) { e_attachment_bar_remove_selected (bar); @@ -1172,7 +1173,8 @@ key_press_event(GtkWidget *widget, GdkEventKey *event) static gint editor_key_press_event(GtkWidget *widget, GdkEventKey *event, CompEditor *editor) { - EAttachmentBar *bar = E_ATTACHMENT_BAR (widget); + CompEditor *Editor = COMP_EDITOR (widget); + EAttachmentBar *bar = E_ATTACHMENT_BAR (Editor->priv->attachment_bar); if (event->keyval == GDK_Escape) { commit_all_fields (editor); @@ -2384,7 +2386,7 @@ static gboolean real_send_comp (CompEditor *editor, ECalComponentItipMethod method) { CompEditorPrivate *priv; - ECalComponent *tmp_comp, *send_comp; + ECalComponent *send_comp; char *address = NULL; g_return_val_if_fail (editor != NULL, FALSE); @@ -2404,15 +2406,6 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method) if (!e_cal_component_has_attachments (priv->comp)) { if (itip_send_comp (method, send_comp, priv->client, NULL, NULL)) { -#if 0 - tmp_comp = priv->comp; - g_object_ref (tmp_comp); - comp_editor_edit_comp (editor, tmp_comp); - g_object_unref (tmp_comp); - - comp_editor_set_changed (editor, TRUE); -#endif - save_comp (editor); g_object_unref (send_comp); return TRUE; } @@ -2434,12 +2427,6 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method) mime_attach_list = comp_editor_get_mime_attach_list (editor); if (itip_send_comp (method, send_comp, priv->client, NULL, mime_attach_list)) { - tmp_comp = priv->comp; - g_object_ref (tmp_comp); - comp_editor_edit_comp (editor, tmp_comp); - g_object_unref (tmp_comp); - - comp_editor_set_changed (editor, TRUE); save_comp (editor); g_object_unref (send_comp); return TRUE; |