** 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

1 files changed, 25 insertions, 15 deletions

diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h
index 63c4b24081..2f8330d8e4 100644
--- a/calendar/gui/dialogs/task-editor.h
+++ b/calendar/gui/dialogs/task-editor.h
@@ -27,14 +27,26 @@
 #include <gtk/gtk.h>
 #include "comp-editor.h"
 
-
+/* Standard GObject macros */
+#define TYPE_TASK_EDITOR \
+	(task_editor_get_type ())
+#define TASK_EDITOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), TYPE_TASK_EDITOR, TaskEditor))
+#define TASK_EDITOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), TYPE_TASK_EDITOR, TaskEditorClass))
+#define IS_TASK_EDITOR(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), TYPE_TASK_EDITOR))
+#define IS_TASK_EDITOR_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), TYPE_TASK_EDITOR))
+#define TASK_EDITOR_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), TYPE_TASK_EDITOR, TaskEditorClass))
 
-#define TYPE_TASK_EDITOR            (task_editor_get_type ())
-#define TASK_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TASK_EDITOR, TaskEditor))
-#define TASK_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TASK_EDITOR,	\
-				      TaskEditorClass))
-#define IS_TASK_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TASK_EDITOR))
-#define IS_TASK_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TASK_EDITOR))
+G_BEGIN_DECLS
 
 typedef struct _TaskEditor TaskEditor;
 typedef struct _TaskEditorClass TaskEditorClass;
@@ -42,8 +54,6 @@ typedef struct _TaskEditorPrivate TaskEditorPrivate;
 
 struct _TaskEditor {
 	CompEditor parent;
-
-	/* Private data */
 	TaskEditorPrivate *priv;
 };
 
@@ -51,11 +61,11 @@ struct _TaskEditorClass {
 	CompEditorClass parent_class;
 };
 
-GType       task_editor_get_type       (void);
-TaskEditor *task_editor_construct      (TaskEditor *te,
-					ECal  *client);
-TaskEditor *task_editor_new            (ECal  *client, CompEditorFlags flags);
-void        task_editor_show_assignment(TaskEditor *te);
-
+GType		task_editor_get_type		(void);
+CompEditor *	task_editor_new			(ECal *client,
+						 CompEditorFlags flags);
+void		task_editor_show_assignment	(TaskEditor *te);
+
+G_END_DECLS
 
 #endif /* __TASK_EDITOR_H__ */