ditto

2004-10-13  JP Rosevear  <jpr@novell.com>

	* gui/dialogs/task-page.c: ditto

	* gui/calendar-component.h: remove e-source-selector include

	* gui/tasks-component.h: ditto

	* gui/calendar-component.c: update include to libedataserverui for
	source selector and option menus

	* gui/e-cal-popup.c: ditto

	* gui/dialogs/url-editor-dialog.h: ditto

	* gui/dialogs/select-source-dialog.c: ditto

	* gui/tasks-component.c: ditto

	* importers/icalendar-importer.c: ditto

	* gui/e-itip-control.c: ditto; use G_DEFINE_TYPE instead of
	E_MAKE_TYPE

	* gui/dialogs/event-page.c: ditto

	* gui/dialogs/task-page.c: ditto

svn path=/trunk/; revision=27569

12 files changed, 50 insertions, 68 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 00c6add687..26cdc962b3 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,31 @@
+2004-10-13  JP Rosevear  <jpr@novell.com>
+
+	* gui/dialogs/task-page.c: ditto
+
+	* gui/calendar-component.h: remove e-source-selector include
+
+	* gui/tasks-component.h: ditto
+	
+	* gui/calendar-component.c: update include to libedataserverui for
+	source selector and option menus
+	
+	* gui/e-cal-popup.c: ditto
+
+	* gui/dialogs/url-editor-dialog.h: ditto
+
+	* gui/dialogs/select-source-dialog.c: ditto
+
+	* gui/tasks-component.c: ditto
+
+	* importers/icalendar-importer.c: ditto
+	
+	* gui/e-itip-control.c: ditto; use G_DEFINE_TYPE instead of
+	E_MAKE_TYPE
+	
+	* gui/dialogs/event-page.c: ditto	
+
+	* gui/dialogs/task-page.c: ditto
+	
 2004-10-12  Li Yuan  <li.yuan@sun.com>
 
 	* gui/e-day-view.c: (e_day_view_on_main_canvas_button_press):
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index b1d63987bd..ff09634a0b 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -32,6 +32,7 @@
 #include <bonobo/bonobo-exception.h>
 #include <libical/icalvcal.h>
 #include <libecal/e-cal-time-util.h>
+#include <libedataserverui/e-source-selector.h>
 #include <shell/e-user-creatable-items-handler.h>
 #include "e-pub-utils.h"
 #include "e-calendar-view.h"
@@ -49,7 +50,6 @@
 #include "dialogs/comp-editor.h"
 #include "dialogs/copy-source-dialog.h"
 #include "dialogs/event-editor.h"
-#include "widgets/misc/e-source-selector.h"
 #include "widgets/misc/e-info-label.h"
 #include "widgets/misc/e-error.h"
 #include "e-util/e-icon-factory.h"
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
index c562d15e13..58c808b8ec 100644
--- a/calendar/gui/calendar-component.h
+++ b/calendar/gui/calendar-component.h
@@ -26,8 +26,6 @@
 
 #include <bonobo/bonobo-object.h>
 #include <libedataserver/e-source-list.h>
-
-#include "widgets/misc/e-source-selector.h"
 #include "Evolution.h"
 
 
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 */
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index bfa8f971f7..9c594416d8 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -29,7 +29,7 @@
 #include <glib.h>
 
 #include "e-cal-popup.h"
-#include "widgets/misc/e-source-selector.h"
+#include <libedataserverui/e-source-selector.h>
 
 #include "gui/e-calendar-view.h"
 #include "gui/e-cal-model.h"
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 82d90c36fb..2ea9ed758b 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -43,6 +43,7 @@
 #include <gtkhtml/gtkhtml-embedded.h>
 #include <gtkhtml/gtkhtml-stream.h>
 #include <libedataserver/e-source-list.h>
+#include <libedataserverui/e-source-option-menu.h>
 #include <libical/ical.h>
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal-time-util.h>
@@ -50,7 +51,6 @@
 #include <e-util/e-time-utils.h>
 #include <e-util/e-dialog-widgets.h>
 #include <e-util/e-html-utils.h>
-#include <widgets/misc/e-source-option-menu.h>
 #include "dialogs/delete-error.h"
 #include "calendar-config.h"
 #include "itip-utils.h"
@@ -104,22 +104,17 @@ struct _EItipControlPrivate {
 #define HTML_BODY_END   "</body>"
 #define HTML_FOOTER     "</html>"
 
-static void class_init	(EItipControlClass	 *klass);
-static void init	(EItipControl		 *itip);
-static void destroy	(GtkObject               *obj);
+static void e_itip_control_destroy	(GtkObject               *obj);
 
 static void find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_partstat *status);
 static void url_requested_cb (GtkHTML *html, const gchar *url, GtkHTMLStream *handle, gpointer data);
 static gboolean object_requested_cb (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data);
 static void ok_clicked_cb (GtkWidget *widget, gpointer data);
 
-static GtkVBoxClass *parent_class = NULL;
-
-E_MAKE_TYPE (e_itip_control, "EItipControl", EItipControl, class_init, init,
-	     GTK_TYPE_VBOX);
+G_DEFINE_TYPE (EItipControl, e_itip_control, GTK_TYPE_VBOX);
 
 static void
-class_init (EItipControlClass *klass)
+e_itip_control_class_init (EItipControlClass *klass)
 {
 	GObjectClass *object_class;
 	GtkObjectClass *gtkobject_class;
@@ -127,9 +122,7 @@ class_init (EItipControlClass *klass)
 	object_class = G_OBJECT_CLASS (klass);
 	gtkobject_class = GTK_OBJECT_CLASS (klass);
 	
-	parent_class = g_type_class_peek_parent (klass);
-
-	gtkobject_class->destroy = destroy;
+	gtkobject_class->destroy = e_itip_control_destroy;
 }
 
 static void
@@ -389,7 +382,7 @@ html_destroyed (gpointer data)
 }
 
 static void
-init (EItipControl *itip)
+e_itip_control_init (EItipControl *itip)
 {
 	EItipControlPrivate *priv;
 	GtkWidget *scrolled_window;
@@ -489,7 +482,7 @@ clean_up (EItipControl *itip)
 }
 
 static void
-destroy (GtkObject *obj)
+e_itip_control_destroy (GtkObject *obj)
 {
 	EItipControl *itip = E_ITIP_CONTROL (obj);
 	EItipControlPrivate *priv;
@@ -519,7 +512,7 @@ destroy (GtkObject *obj)
 		itip->priv = NULL;
 	}
 	
-	(* GTK_OBJECT_CLASS (parent_class)->destroy) (obj);
+	(* GTK_OBJECT_CLASS (e_itip_control_parent_class)->destroy) (obj);
 }
 
 GtkWidget *
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index d5455468eb..e5c26514b2 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -31,6 +31,7 @@
 #include <bonobo/bonobo-exception.h>
 #include <gconf/gconf-client.h>
 #include <libecal/e-cal.h>
+#include <libedataserverui/e-source-selector.h>
 #include <shell/e-user-creatable-items-handler.h>
 #include "e-cal-model.h"
 #include "e-tasks.h"
@@ -46,7 +47,6 @@
 #include "dialogs/comp-editor.h"
 #include "dialogs/copy-source-dialog.h"
 #include "dialogs/task-editor.h"
-#include "widgets/misc/e-source-selector.h"
 #include "widgets/misc/e-info-label.h"
 #include "widgets/misc/e-error.h"
 #include "e-util/e-icon-factory.h"
diff --git a/calendar/gui/tasks-component.h b/calendar/gui/tasks-component.h
index 1387599f00..b5050f3840 100644
--- a/calendar/gui/tasks-component.h
+++ b/calendar/gui/tasks-component.h
@@ -26,7 +26,6 @@
 #include <bonobo/bonobo-object.h>
 #include <libedataserver/e-source-list.h>
 #include <widgets/misc/e-activity-handler.h>
-#include <widgets/misc/e-source-selector.h>
 #include "Evolution.h"
 
 
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index 5235f6a411..28318f01ba 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -40,7 +40,7 @@
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-exception.h>
 #include <libecal/e-cal.h>
-#include <widgets/misc/e-source-selector.h>
+#include <libedataserverui/e-source-selector.h>
 #include <importer/evolution-importer.h>
 #include <importer/evolution-intelligent-importer.h>
 #include <importer/GNOME_Evolution_Importer.h>