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/memos-component.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/memos-component.c')
| -rw-r--r-- | calendar/gui/memos-component.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index df17624f75..0d95f2c2d8 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -988,7 +988,7 @@ object_created_cb (CompEditor *ce, EMemoTable *memo_table) { g_return_if_fail (memo_table != NULL); - memo_table->user_created_cal = comp_editor_get_e_cal (ce); + memo_table->user_created_cal = comp_editor_get_client (ce); g_signal_emit_by_name (memo_table, "user_created"); memo_table->user_created_cal = NULL; } @@ -998,7 +998,7 @@ create_new_memo (MemosComponent *memo_component, gboolean is_assigned, MemosComp { ECal *ecal; ECalComponent *comp; - MemoEditor *editor; + CompEditor *editor; CompEditorFlags flags = 0; ecal = setup_create_ecal (memo_component, component_view); @@ -1017,10 +1017,10 @@ create_new_memo (MemosComponent *memo_component, gboolean is_assigned, MemosComp if (component_view) g_signal_connect (editor, "object_created", G_CALLBACK (object_created_cb), e_memos_get_calendar_table (component_view->memos)); - comp_editor_edit_comp (COMP_EDITOR (editor), comp); - comp_editor_focus (COMP_EDITOR (editor)); + comp_editor_edit_comp (editor, comp); + gtk_window_present (GTK_WINDOW (editor)); - e_comp_editor_registry_add (comp_editor_registry, COMP_EDITOR (editor), TRUE); + e_comp_editor_registry_add (comp_editor_registry, editor, TRUE); return TRUE; } |