aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/dialogs/memo-editor.c22
2 files changed, 24 insertions, 6 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8b85dbfd77..f285e27a1e 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-31 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fix for bug #562091
+
+ * gui/dialogs/memo-editor.c (memo_editor_constructed),
+ (memo_editor_class_init), (memo_editor_init): Create MemoPage
+ after the base class object has been created and initialized.
+
2008-12-29 Bharath Acharya <abharath@novell.com>
** Fix for bug #446285 (bnc)
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index 89016f8c91..4fbf35d916 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -97,6 +97,21 @@ memo_editor_dispose (GObject *object)
}
static void
+memo_editor_constructed (GObject *object)
+{
+ MemoEditorPrivate *priv;
+ CompEditor *editor;
+
+ priv = MEMO_EDITOR_GET_PRIVATE (object);
+ editor = COMP_EDITOR (object);
+
+ priv->memo_page = memo_page_new (editor);
+ comp_editor_append_page (
+ editor, COMP_EDITOR_PAGE (priv->memo_page),
+ _("Memo"), TRUE);
+}
+
+static void
memo_editor_class_init (MemoEditorClass *class)
{
GObjectClass *object_class;
@@ -106,6 +121,7 @@ memo_editor_class_init (MemoEditorClass *class)
object_class = G_OBJECT_CLASS (class);
object_class->dispose = memo_editor_dispose;
+ object_class->constructed = memo_editor_constructed;
/* TODO Add a help section for memos. */
editor_class = COMP_EDITOR_CLASS (class);
@@ -132,12 +148,6 @@ memo_editor_init (MemoEditor *me)
g_critical ("%s: %s", G_STRFUNC, error->message);
g_error_free (error);
}
-
- me->priv->memo_page = memo_page_new (editor);
- comp_editor_append_page (
- COMP_EDITOR (me),
- COMP_EDITOR_PAGE (me->priv->memo_page),
- _("Memo"), TRUE);
}
/**