aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui/e-calendar-view.c
diff options
context:
space:
mode:
Diffstat (limited to 'calendar/gui/e-calendar-view.c')
-rw-r--r--calendar/gui/e-calendar-view.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 152a2110c9..b1ec9624c0 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1966,7 +1966,7 @@ e_calendar_view_new_appointment (ECalendarView *cal_view)
static void
object_created_cb (CompEditor *ce, ECalendarView *cal_view)
{
- gnome_calendar_emit_user_created_signal (cal_view, e_calendar_view_get_calendar (cal_view), comp_editor_get_e_cal (ce));
+ gnome_calendar_emit_user_created_signal (cal_view, e_calendar_view_get_calendar (cal_view), comp_editor_get_client (ce));
}
static void
@@ -1981,10 +1981,7 @@ open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *ica
ce = e_comp_editor_registry_find (comp_editor_registry, uid);
if (!ce) {
- EventEditor *ee;
-
- ee = event_editor_new (client, flags);
- ce = COMP_EDITOR (ee);
+ ce = event_editor_new (client, flags);
g_signal_connect (ce, "object_created", G_CALLBACK (object_created_cb), cal_view);
@@ -1992,14 +1989,14 @@ open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *ica
e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (icalcomp));
comp_editor_edit_comp (ce, comp);
if (flags & COMP_EDITOR_MEETING)
- event_editor_show_meeting (ee);
+ event_editor_show_meeting (EVENT_EDITOR (ce));
e_comp_editor_registry_add (comp_editor_registry, ce, FALSE);
g_object_unref (comp);
}
- comp_editor_focus (ce);
+ gtk_window_present (GTK_WINDOW (ce));
}