1 files changed, 24 insertions, 12 deletions

diff --git a/calendar/gui/dialogs/memo-editor.h b/calendar/gui/dialogs/memo-editor.h
index 76f8ccb5df..ab229584e5 100644
--- a/calendar/gui/dialogs/memo-editor.h
+++ b/calendar/gui/dialogs/memo-editor.h
@@ -28,12 +28,26 @@
 #include <gtk/gtk.h>
 #include "comp-editor.h"
 
-#define TYPE_MEMO_EDITOR            (memo_editor_get_type ())
-#define MEMO_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEMO_EDITOR, MemoEditor))
-#define MEMO_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEMO_EDITOR,	\
-				      MemoEditorClass))
-#define IS_MEMO_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEMO_EDITOR))
-#define IS_MEMO_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_MEMO_EDITOR))
+/* Standard GObject macros */
+#define TYPE_MEMO_EDITOR \
+	(memo_editor_get_type ())
+#define MEMO_EDITOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), TYPE_MEMO_EDITOR, MemoEditor))
+#define MEMO_EDITOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), TYPE_MEMO_EDITOR, MemoEditorClass))
+#define IS_MEMO_EDITOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), TYPE_MEMO_EDITOR))
+#define IS_MEMO_EDITOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), TYPE_MEMO_EDITOR))
+#define MEMO_EDITOR_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), TYPE_MEMO_EDITOR, MemoEditorClass))
+
+G_BEGIN_DECLS
 
 typedef struct _MemoEditor MemoEditor;
 typedef struct _MemoEditorClass MemoEditorClass;
@@ -41,8 +55,6 @@ typedef struct _MemoEditorPrivate MemoEditorPrivate;
 
 struct _MemoEditor {
 	CompEditor parent;
-
-	/* Private data */
 	MemoEditorPrivate *priv;
 };
 
@@ -50,10 +62,10 @@ struct _MemoEditorClass {
 	CompEditorClass parent_class;
 };
 
-GType       memo_editor_get_type       (void);
-MemoEditor *memo_editor_construct      (MemoEditor *te,
-					ECal  *client);
-MemoEditor *memo_editor_new            (ECal  *client, CompEditorFlags flags);
+GType		memo_editor_get_type		(void);
+CompEditor *	memo_editor_new			(ECal *client,
+						 CompEditorFlags flags);
 
+G_END_DECLS
 
 #endif /* __MEMO_EDITOR_H__ */