4 files changed, 10 insertions, 46 deletions
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index d5a73c92a1..d0a4283366 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -33,11 +33,11 @@
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 #include <gal/widgets/e-categories.h>
+#include <libedataserverui/e-source-option-menu.h>
 #include "common/authentication.h"
 #include "e-util/e-categories-config.h"
 #include "e-util/e-dialog-widgets.h"
 #include "widgets/misc/e-dateedit.h"
-#include "widgets/misc/e-source-option-menu.h"
 #include <libecal/e-cal-time-util.h>
 #include "../calendar-config.h"
 #include "../e-timezone-entry.h"
@@ -101,8 +101,6 @@ struct _EventPagePrivate {
 
 
 
-static void event_page_class_init (EventPageClass *class);
-static void event_page_init (EventPage *epage);
 static void event_page_finalize (GObject *object);
 
 static GtkWidget *event_page_get_widget (CompEditorPage *page);
@@ -113,21 +111,7 @@ static gboolean event_page_fill_timezones (CompEditorPage *page, GHashTable *tim
 static void event_page_set_summary (CompEditorPage *page, const char *summary);
 static void event_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
 
-static CompEditorPageClass *parent_class = NULL;
-
-
-
-/**
- * event_page_get_type:
- * 
- * Registers the #EventPage class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #EventPage class.
- **/
-
-E_MAKE_TYPE (event_page, "EventPage", EventPage, event_page_class_init, event_page_init,
-	     TYPE_COMP_EDITOR_PAGE);
+G_DEFINE_TYPE (EventPage, event_page, TYPE_COMP_EDITOR_PAGE);
 
 /* Class initialization function for the event page */
 static void
@@ -139,8 +123,6 @@ event_page_class_init (EventPageClass *class)
 	editor_page_class = (CompEditorPageClass *) class;
 	object_class = (GObjectClass *) class;
 
-	parent_class = g_type_class_ref (TYPE_COMP_EDITOR_PAGE);
-
 	editor_page_class->get_widget = event_page_get_widget;
 	editor_page_class->focus_main_widget = event_page_focus_main_widget;
 	editor_page_class->fill_widgets = event_page_fill_widgets;
@@ -219,8 +201,8 @@ event_page_finalize (GObject *object)
 	g_free (priv);
 	epage->priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	if (G_OBJECT_CLASS (event_page_parent_class)->finalize)
+		(* G_OBJECT_CLASS (event_page_parent_class)->finalize) (object);
 }
 
 
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index 6dd3d50cfd..68747ff4e0 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -31,7 +31,7 @@
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkstock.h>
 #include <e-util/e-icon-factory.h>
-#include "widgets/misc/e-source-selector.h"
+#include <libedataserverui/e-source-selector.h>
 #include "select-source-dialog.h"
 
 static void
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 2779c0f2a2..661eb452e3 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -35,8 +35,8 @@
 #include <libgnome/gnome-i18n.h>
 #include <glade/glade.h>
 #include <gal/widgets/e-categories.h>
+#include <libedataserverui/e-source-option-menu.h>
 #include <widgets/misc/e-dateedit.h>
-#include "widgets/misc/e-source-option-menu.h"
 #include "common/authentication.h"
 #include "e-util/e-dialog-widgets.h"
 #include "e-util/e-categories-config.h"
@@ -85,8 +85,6 @@ static const int classification_map[] = {
 
 
 
-static void task_page_class_init (TaskPageClass *class);
-static void task_page_init (TaskPage *tpage);
 static void task_page_finalize (GObject *object);
 
 static GtkWidget *task_page_get_widget (CompEditorPage *page);
@@ -97,21 +95,7 @@ static gboolean task_page_fill_timezones (CompEditorPage *page, GHashTable *time
 static void task_page_set_summary (CompEditorPage *page, const char *summary);
 static void task_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
 
-static CompEditorPageClass *parent_class = NULL;
-
-
-
-/**
- * task_page_get_type:
- * 
- * Registers the #TaskPage class if necessary, and returns the type ID
- * associated to it.
- * 
- * Return value: The type ID of the #TaskPage class.
- **/
-
-E_MAKE_TYPE (task_page, "TaskPage", TaskPage, task_page_class_init, task_page_init,
-	     TYPE_COMP_EDITOR_PAGE);
+G_DEFINE_TYPE (TaskPage, task_page, TYPE_COMP_EDITOR_PAGE);
 
 /* Class initialization function for the task page */
 static void
@@ -123,8 +107,6 @@ task_page_class_init (TaskPageClass *class)
 	editor_page_class = (CompEditorPageClass *) class;
 	object_class = (GObjectClass *) class;
 
-	parent_class = g_type_class_ref(TYPE_COMP_EDITOR_PAGE);
-
 	editor_page_class->get_widget = task_page_get_widget;
 	editor_page_class->focus_main_widget = task_page_focus_main_widget;
 	editor_page_class->fill_widgets = task_page_fill_widgets;
@@ -186,8 +168,8 @@ task_page_finalize (GObject *object)
 	g_free (priv);
 	tpage->priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	if (G_OBJECT_CLASS (task_page_parent_class)->finalize)
+		(* G_OBJECT_CLASS (task_page_parent_class)->finalize) (object);
 }
 
 
diff --git a/calendar/gui/dialogs/url-editor-dialog.h b/calendar/gui/dialogs/url-editor-dialog.h
index 12930f45cd..877dc8a748 100644
--- a/calendar/gui/dialogs/url-editor-dialog.h
+++ b/calendar/gui/dialogs/url-editor-dialog.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 #include <glade/glade.h>
 
 #include "cal-prefs-dialog.h"
-#include "widgets/misc/e-source-selector.h"
+#include <libedataserverui/e-source-selector.h>
 
 struct _UrlDialogData {
 	/* Glade XML data */