diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2008-07-19 00:23:26 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-07-19 00:23:26 +0800 |
commit | 0597b877c5bf4d21ac4048742ddf6b11e24877ba (patch) | |
tree | 74501a98fdec4d2c11d26a1f1d7d43a3058ad6f5 /calendar/gui/comp-editor-factory.c | |
parent | 68d73b10b22a2ba0e022b812321bc435e04c4867 (diff) | |
download | gsoc2013-evolution-0597b877c5bf4d21ac4048742ddf6b11e24877ba.tar gsoc2013-evolution-0597b877c5bf4d21ac4048742ddf6b11e24877ba.tar.gz gsoc2013-evolution-0597b877c5bf4d21ac4048742ddf6b11e24877ba.tar.bz2 gsoc2013-evolution-0597b877c5bf4d21ac4048742ddf6b11e24877ba.tar.lz gsoc2013-evolution-0597b877c5bf4d21ac4048742ddf6b11e24877ba.tar.xz gsoc2013-evolution-0597b877c5bf4d21ac4048742ddf6b11e24877ba.tar.zst gsoc2013-evolution-0597b877c5bf4d21ac4048742ddf6b11e24877ba.zip |
** Fixes bug #542125
2008-07-18 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #542125
** This set of changes migrates CompEditor, CompEditorPage and the
various subclasses from using BonoboUI to GtkUIManager for menus
and toolbars. It also substantially cleans up the code and
streamlines the CompEditorPage API, making more effective use
of GObject properties.
Core changes:
* gui/dialogs/comp-editor-page.c:
* gui/dialogs/comp-editor-page.h:
* gui/dialogs/comp-editor.c:
* gui/dialogs/comp-editor.h:
* gui/dialogs/event-editor.c:
* gui/dialogs/event-editor.h:
* gui/dialogs/event-page.c:
* gui/dialogs/event-page.h:
* gui/dialogs/memo-editor.c:
* gui/dialogs/memo-editor.h:
* gui/dialogs/memo-page.c:
* gui/dialogs/memo-page.h:
* gui/dialogs/recurrence-page.c:
* gui/dialogs/recurrence-page.h:
* gui/dialogs/schedule-page.c:
* gui/dialogs/schedule-page.h:
* gui/dialogs/task-details-page.c:
* gui/dialogs/task-details-page.h:
* gui/dialogs/task-editor.c:
* gui/dialogs/task-editor.h:
* gui/dialogs/task-page.c:
* gui/dialogs/task-page.h:
Supporting changes:
* gui/calendar-component.c:
* gui/comp-editor-factory.c:
* gui/e-cal-popup.c:
* gui/e-calendar-table.c:
* gui/e-calendar-view.c:
* gui/e-comp-editor-registry.c:
* gui/e-memo-table.c:
* gui/e-tasks.c:
* gui/gnome-cal.c:
* gui/memos-component.c:
* gui/tasks-component.c:
* gui/dialogs/alarm-dialog.c:
* gui/dialogs/comp-editor-util.c:
* art/Makefile.am:
Move query-free-busy.png to data/icons.
svn path=/trunk/; revision=35753
Diffstat (limited to 'calendar/gui/comp-editor-factory.c')
-rw-r--r-- | calendar/gui/comp-editor-factory.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c index b6d168eda3..508714dbc3 100644 --- a/calendar/gui/comp-editor-factory.c +++ b/calendar/gui/comp-editor-factory.c @@ -265,7 +265,7 @@ edit_existing (OpenClient *oc, const char *uid) if (e_cal_component_has_attendees (comp)) flags |= COMP_EDITOR_MEETING; - editor = COMP_EDITOR (event_editor_new (oc->client, flags)); + editor = event_editor_new (oc->client, flags); break; case E_CAL_COMPONENT_TODO: @@ -280,7 +280,7 @@ edit_existing (OpenClient *oc, const char *uid) /* Set the object on the editor */ comp_editor_edit_comp (editor, comp); - comp_editor_focus (editor); + gtk_window_present (GTK_WINDOW (editor)); g_object_unref (comp); oc->editor_count++; @@ -308,15 +308,15 @@ edit_new (OpenClient *oc, const GNOME_Evolution_Calendar_CompEditorFactory_CompE switch (type) { case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_EVENT: - editor = COMP_EDITOR (event_editor_new (oc->client, FALSE)); + editor = event_editor_new (oc->client, FALSE); comp = cal_comp_event_new_with_current_time (oc->client, FALSE); break; case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING: - editor = COMP_EDITOR (event_editor_new (oc->client, TRUE)); + editor = event_editor_new (oc->client, TRUE); comp = cal_comp_event_new_with_current_time (oc->client, FALSE); break; case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_ALLDAY_EVENT: - editor = COMP_EDITOR (event_editor_new (oc->client, FALSE)); + editor = event_editor_new (oc->client, FALSE); comp = cal_comp_event_new_with_current_time (oc->client, TRUE); break; case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO: @@ -331,7 +331,7 @@ edit_new (OpenClient *oc, const GNOME_Evolution_Calendar_CompEditorFactory_CompE comp_editor_edit_comp (editor, comp); if (type == GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_MEETING) event_editor_show_meeting (EVENT_EDITOR (editor)); - comp_editor_focus (editor); + gtk_window_present (GTK_WINDOW (editor)); oc->editor_count++; g_signal_connect (editor, "destroy", G_CALLBACK (editor_destroy_cb), oc); @@ -566,7 +566,7 @@ impl_editExisting (PortableServer_Servant servant, if (editor == NULL) { edit_existing (oc, uid); } else { - comp_editor_focus (editor); + gtk_window_present (GTK_WINDOW (editor)); } } |