** 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, 65 insertions, 41 deletions

diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h
index 26e4dea9dd..2f61631960 100644
--- a/calendar/gui/dialogs/event-page.h
+++ b/calendar/gui/dialogs/event-page.h
@@ -24,62 +24,86 @@
 #ifndef EVENT_PAGE_H
 #define EVENT_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"
 #include "../e-meeting-attendee.h"
 #include "../e-meeting-store.h"
 #include "../e-meeting-list-view.h"
 
-G_BEGIN_DECLS
-
-
+/* Standard GObject macros */
+#define TYPE_EVENT_PAGE \
+	(event_page_get_type ())
+#define EVENT_PAGE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), TYPE_EVENT_PAGE, EventPage))
+#define EVENT_PAGE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), TYPE_EVENT_PAGE, EventPageClass))
+#define IS_EVENT_PAGE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), TYPE_EVENT_PAGE))
+#define IS_EVENT_PAGE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((obj), TYPE_EVENT_PAGE))
+#define EVENT_PAGE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), TYPE_EVENT_PAGE, EventPageClass))
 
-#define TYPE_EVENT_PAGE            (event_page_get_type ())
-#define EVENT_PAGE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_PAGE, EventPage))
-#define EVENT_PAGE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EVENT_PAGE, EventPageClass))
-#define IS_EVENT_PAGE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EVENT_PAGE))
-#define IS_EVENT_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_EVENT_PAGE))
+G_BEGIN_DECLS
 
+typedef struct _EventPage EventPage;
+typedef struct _EventPageClass EventPageClass;
 typedef struct _EventPagePrivate EventPagePrivate;
 
-typedef struct {
+struct _EventPage {
 	CompEditorPage page;
-
-	/* Private data */
 	EventPagePrivate *priv;
-} EventPage;
+};
 
-typedef struct {
+struct _EventPageClass {
 	CompEditorPageClass parent_class;
-} EventPageClass;
-
+};
 
-GType      event_page_get_type  (void);
-EventPage *event_page_construct (EventPage *epage, EMeetingStore *model, ECal *client);
-EventPage *event_page_new       (EMeetingStore *model, ECal *client, BonoboUIComponent *uic);
-ECalComponent *event_page_get_cancel_comp (EventPage *page);
-void event_page_show_options (EventPage *page);
-void event_page_hide_options (EventPage *page);
-void event_page_sendoptions_clicked_cb (EventPage *epage);
-void event_page_set_meeting (EventPage *page, gboolean set);
-void event_page_set_show_timezone (EventPage *epage, gboolean state);
-void event_page_set_view_rsvp (EventPage *epage, gboolean state);
-void event_page_set_classification (EventPage *epage, ECalComponentClassification class);
-void event_page_set_delegate (EventPage *page, gboolean set);
-void event_page_set_all_day_event (EventPage *epage, gboolean all_day);
-void event_page_set_show_categories (EventPage *epage, gboolean state);
-void event_page_set_show_time_busy (EventPage *epage, gboolean state);
-void event_page_show_alarm (EventPage *epage);
-void event_page_set_info_string (EventPage *epage, const gchar *icon, const gchar *msg);
+GType		event_page_get_type		(void);
+EventPage *	event_page_construct		(EventPage *epage,
+						 EMeetingStore *model);
+EventPage *	event_page_new			(EMeetingStore *model,
+						 CompEditor *editor);
+ECalComponent *	event_page_get_cancel_comp	(EventPage *page);
+void		event_page_show_options		(EventPage *page);
+void		event_page_hide_options		(EventPage *page);
+void		event_page_sendoptions_clicked_cb
+						(EventPage *epage);
+void		event_page_set_meeting		(EventPage *page,
+						 gboolean set);
+void		event_page_set_show_timezone	(EventPage *epage,
+						 gboolean state);
+void		event_page_set_view_rsvp	(EventPage *epage,
+						 gboolean state);
+void		event_page_set_delegate		(EventPage *page,
+						 gboolean set);
+void		event_page_set_all_day_event	(EventPage *epage,
+						 gboolean all_day);
+void		event_page_set_show_categories	(EventPage *epage,
+						 gboolean state);
+void		event_page_set_show_time_busy	(EventPage *epage,
+						 gboolean state);
+void		event_page_show_alarm		(EventPage *epage);
+void		event_page_set_info_string	(EventPage *epage,
+						 const gchar *icon,
+						 const gchar *msg);
 
-void event_page_set_view_role (EventPage *epage, gboolean state);
-void event_page_set_view_status (EventPage *epage, gboolean state);
-void event_page_set_view_type (EventPage *epage, gboolean state);
-void event_page_set_view_rvsp (EventPage *epage, gboolean state);
-ENameSelector *event_page_get_name_selector (EventPage *epage);
-void event_page_add_attendee (EventPage *epage, EMeetingAttendee *attendee);
+void		event_page_set_view_role	(EventPage *epage,
+						 gboolean state);
+void		event_page_set_view_status	(EventPage *epage,
+						 gboolean state);
+void		event_page_set_view_type	(EventPage *epage,
+						 gboolean state);
+void		event_page_set_view_rvsp	(EventPage *epage,
+						 gboolean state);
+ENameSelector *	event_page_get_name_selector	(EventPage *epage);
+void		event_page_add_attendee		(EventPage *epage,
+						 EMeetingAttendee *attendee);
 
 G_END_DECLS