GObject boilerplate cleanup.

Prefer thread-safe G_DEFINE_TYPE and G_DEFINE_INTERFACE macros over
manual GType registration.

This is just a start... lots more to do.

8 files changed, 21 insertions, 21 deletions

diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index c4ed13f2cb..c56caab8bf 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 void
-e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, const gchar *type)
+e_send_options_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, const gchar *type)
 {
 	ESendOptionsGeneral *gopts = NULL;
 	ESendOptionsStatusTracking *sopts;
@@ -151,7 +151,7 @@ e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source,
 }
 
 void
-e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp)
+e_send_options_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp)
 {
 	gint i = 1;
 	icalproperty *prop;
@@ -165,7 +165,7 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp
 	e_cal_component_set_sequence (comp, &i);
 	icalcomp = e_cal_component_get_icalcomponent (comp);
 
-	if (e_sendoptions_get_need_general_options (sod)) {
+	if (e_send_options_get_need_general_options (sod)) {
 		prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", gopts->priority));
 		icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-PRIORITY");
 		icalcomponent_add_property (icalcomp, prop);
diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h
index 01cf3ed2e9..d6852b8f5a 100644
--- a/calendar/gui/dialogs/e-send-options-utils.h
+++ b/calendar/gui/dialogs/e-send-options-utils.h
@@ -29,6 +29,6 @@
 #include <libecal/e-cal-component.h>
 #include <libedataserver/e-source-list.h>
 
-void e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, const gchar *type);
-void e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp);
+void e_send_options_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, const gchar *type);
+void e_send_options_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp);
 #endif
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 177482f808..396b9b8d08 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -197,7 +197,7 @@ static void
 action_send_options_cb (GtkAction *action,
                         EventEditor *editor)
 {
-	event_page_sendoptions_clicked_cb (editor->priv->event_page);
+	event_page_send_options_clicked_cb (editor->priv->event_page);
 }
 
 static void
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index fd42d93a81..b221368f94 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1401,7 +1401,7 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 
 	/* send options */
 	if (priv->sendoptions_shown && priv->sod)
-		e_sendoptions_utils_fill_component (priv->sod, comp);
+		e_send_options_utils_fill_component (priv->sod, comp);
 
 	/* Alarm */
 	e_cal_component_remove_all_alarms (comp);
@@ -2581,7 +2581,7 @@ categories_clicked_cb (GtkWidget *button,
 }
 
 void
-event_page_sendoptions_clicked_cb (EventPage *epage)
+event_page_send_options_clicked_cb (EventPage *epage)
 {
 	EventPagePrivate *priv;
 	CompEditor *editor;
@@ -2594,19 +2594,19 @@ event_page_sendoptions_clicked_cb (EventPage *epage)
 	client = comp_editor_get_client (editor);
 
 	if (!priv->sod) {
-		priv->sod = e_sendoptions_dialog_new ();
+		priv->sod = e_send_options_dialog_new ();
 		source = e_source_combo_box_get_active (
 			E_SOURCE_COMBO_BOX (priv->source_selector));
-		e_sendoptions_utils_set_default_data (priv->sod, source, "calendar");
+		e_send_options_utils_set_default_data (priv->sod, source, "calendar");
 		priv->sod->data->initialized = TRUE;
 	}
 
 	if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS)) {
-		e_sendoptions_set_need_general_options (priv->sod, FALSE);
+		e_send_options_set_need_general_options (priv->sod, FALSE);
 	}
 
 	toplevel = gtk_widget_get_toplevel (priv->main);
-	e_sendoptions_dialog_run (priv->sod, toplevel, E_ITEM_CALENDAR);
+	e_send_options_dialog_run (priv->sod, toplevel, E_ITEM_CALENDAR);
 }
 
 static void
diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h
index afa191e9c1..3cfff34b89 100644
--- a/calendar/gui/dialogs/event-page.h
+++ b/calendar/gui/dialogs/event-page.h
@@ -76,7 +76,7 @@ EventPage *	event_page_new			(EMeetingStore *model,
 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
+void		event_page_send_options_clicked_cb
 						(EventPage *epage);
 void		event_page_set_meeting		(EventPage *page,
 						 gboolean set);
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 01f65aa8fd..5a9849db8e 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -107,7 +107,7 @@ static void
 action_send_options_cb (GtkAction *action,
                         TaskEditor *editor)
 {
-	task_page_sendoptions_clicked_cb (editor->priv->task_page);
+	task_page_send_options_clicked_cb (editor->priv->task_page);
 }
 
 static GtkActionEntry task_entries[] = {
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 96ac4e2133..85c6bb15b8 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -936,7 +936,7 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 
 	/* send options */
 	if (priv->sendoptions_shown && priv->sod)
-		e_sendoptions_utils_fill_component (priv->sod, comp);
+		e_send_options_utils_fill_component (priv->sod, comp);
 
 	/* Categories */
 	cat = e_dialog_editable_get (priv->categories);
@@ -1795,7 +1795,7 @@ set_subscriber_info_string (TaskPage *tpage, const gchar *backend_address)
 }
 
 void
-task_page_sendoptions_clicked_cb (TaskPage *tpage)
+task_page_send_options_clicked_cb (TaskPage *tpage)
 {
 	TaskPagePrivate *priv = tpage->priv;
 	CompEditor *editor;
@@ -1807,19 +1807,19 @@ task_page_sendoptions_clicked_cb (TaskPage *tpage)
 	client = comp_editor_get_client (editor);
 
 	if (!priv->sod) {
-		priv->sod = e_sendoptions_dialog_new ();
+		priv->sod = e_send_options_dialog_new ();
 		priv->sod->data->initialized = TRUE;
 		source = e_source_combo_box_get_active (
 			E_SOURCE_COMBO_BOX (priv->source_selector));
-		e_sendoptions_utils_set_default_data (priv->sod, source, "task");
+		e_send_options_utils_set_default_data (priv->sod, source, "task");
 	}
 
 	if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS)) {
-		e_sendoptions_set_need_general_options (priv->sod, FALSE);
+		e_send_options_set_need_general_options (priv->sod, FALSE);
 	}
 
 	toplevel = gtk_widget_get_toplevel (priv->main);
-	e_sendoptions_dialog_run (priv->sod, toplevel, E_ITEM_TASK);
+	e_send_options_dialog_run (priv->sod, toplevel, E_ITEM_TASK);
 }
 
 /* Hooks the widget signals */
diff --git a/calendar/gui/dialogs/task-page.h b/calendar/gui/dialogs/task-page.h
index b8a49f8286..273c316879 100644
--- a/calendar/gui/dialogs/task-page.h
+++ b/calendar/gui/dialogs/task-page.h
@@ -80,7 +80,7 @@ void		task_page_show_options		(TaskPage *page);
 void		task_page_hide_options		(TaskPage *page);
 void		task_page_set_assignment	(TaskPage *page,
 						 gboolean set);
-void		task_page_sendoptions_clicked_cb(TaskPage *tpage);
+void		task_page_send_options_clicked_cb(TaskPage *tpage);
 void		task_page_set_view_role		(TaskPage *page,
 						 gboolean state);
 void		task_page_set_view_status	(TaskPage *page,