** 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, 36 insertions, 22 deletions

diff --git a/calendar/gui/dialogs/memo-page.h b/calendar/gui/dialogs/memo-page.h
index 9e62214d00..c96eba9999 100644
--- a/calendar/gui/dialogs/memo-page.h
+++ b/calendar/gui/dialogs/memo-page.h
@@ -24,38 +24,52 @@
 #ifndef MEMO_PAGE_H
 #define MEMO_PAGE_H
 
-#include <bonobo/bonobo-window.h>
-#include <bonobo/bonobo-ui-util.h>
-#include <bonobo/bonobo-widget.h>
+#include "comp-editor.h"
 #include "comp-editor-page.h"
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define TYPE_MEMO_PAGE \
+	(memo_page_get_type ())
+#define MEMO_PAGE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), TYPE_MEMO_PAGE, MemoPage))
+#define MEMO_PAGE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), TYPE_MEMO_PAGE, MemoPageClass))
+#define IS_MEMO_PAGE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), TYPE_MEMO_PAGE))
+#define IS_MEMO_PAGE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((obj), TYPE_MEMO_PAGE))
+#define MEMO_PAGE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), TYPE_MEMO_PAGE, MemoPageClass))
 
-#define TYPE_MEMO_PAGE            (memo_page_get_type ())
-#define MEMO_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEMO_PAGE, MemoPage))
-#define MEMO_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEMO_PAGE, MemoPageClass))
-#define IS_MEMO_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEMO_PAGE))
-#define IS_MEMO_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_MEMO_PAGE))
+G_BEGIN_DECLS
 
+typedef struct _MemoPage MemoPage;
+typedef struct _MemoPageClass MemoPageClass;
 typedef struct _MemoPagePrivate MemoPagePrivate;
 
-typedef struct {
+struct _MemoPage {
 	CompEditorPage page;
-
-	/* Private data */
 	MemoPagePrivate *priv;
-} MemoPage;
+};
 
-typedef struct {
+struct _MemoPageClass {
 	CompEditorPageClass parent_class;
-} MemoPageClass;
-
-GType     memo_page_get_type  (void);
-MemoPage *memo_page_construct (MemoPage *epage);
-MemoPage *memo_page_new       (BonoboUIComponent *uic, CompEditorPageFlags flags);
-void      memo_page_set_classification (MemoPage *page, ECalComponentClassification class);
-void      memo_page_set_show_categories (MemoPage *page, gboolean state);
-void 	  memo_page_set_info_string (MemoPage *mpage, const gchar *icon, const gchar *msg);
+};
+
+GType		memo_page_get_type		(void);
+MemoPage *	memo_page_construct		(MemoPage *epage);
+MemoPage *	memo_page_new			(CompEditor *editor);
+void		memo_page_set_show_categories	(MemoPage *page,
+						 gboolean state);
+void		memo_page_set_info_string	(MemoPage *mpage,
+						 const gchar *icon,
+						 const gchar *msg);
+
 G_END_DECLS
 
 #endif