Replace gtk_signal_disconnect_by_data() with

2002-12-19  Hans Petter Jansson  <hpj@ximian.com>

        * gui/calendar-commands.c (calendar_control_deactivate):
        Replace gtk_signal_disconnect_by_data() with
        g_signal_handlers_disconnect_matched(). Former takes GtkObject,
        latter takes GObject.

        * gui/calendar-model.c (calendar_model_destroy): Ditto.
        (update_query): Ditto.
        (calendar_model_set_cal_client): Ditto.

        * gui/e-day-view.c (e_day_view_destroy): Ditto.
        (update_query): Ditto.
        (e_day_view_set_cal_client): Ditto.

        * gui/e-tasks.c (query_eval_error_cb): Ditto.
        (query_query_done_cb): Ditto.

        * gui/e-week-view.c (e_week_view_destroy): Ditto.
        (update_query): Ditto.
        (e_week_view_set_cal_client): Ditto.

        * gui/gnome-cal.c (update_query): Ditto.
        (gnome_calendar_destroy): Ditto.

        * gui/tasks-control.c (tasks_control_deactivate): Ditto.

        * gui/e-comp-editor-registry.c (foreach_close_cb): Replace
        gtk_signal_handler_(un)block_by_data() with
        g_signal_handlers_(un)block_matched(). Former takes GtkObject, latter
        takes GObject.

        * gui/dialogs/alarm-page.c (alarm_page_get_type): Replace with
        E_MAKE_TYPE().
        (alarm_page_class_init): Use GObject as base class instead of
        GtkObject, and set up finalization instead of destroy handler.
        (alarm_page_destroy): Change to alarm_page_finalize() and assume
        parent is GObject, not GtkObject.
        (alarm_page_new): Use g_object_new(), not gtk_type_new().

        * gui/dialogs/event-page.c: Same general changes as above file.
        (update_time): Replace gtk_signal_handler_(un)block_by_data()
        with g_signal_handlers_(un)block_matched().
        (clear_widgets): Ditto.
        (times_updated): Ditto.

        * gui/dialogs/recurrence-page.c: Same general changes as above file.
        (clear_widgets): Replace gtk_signal_handler_(un)block_by_data()
        with g_signal_handlers_(un)block_matched().
        (append_exception): Ditto.
        (fill_ending_date): Ditto.
        (recurrence_page_fill_widgets): Ditto.

        * gui/dialogs/comp-editor.c: Same general changes as above file.
        (comp_editor_finalize): Replace gtk_signal_disconnect_by_data()
        with g_signal_handlers_disconnect_matched().
        (comp_editor_remove_page): Ditto.

        * gui/dialogs/event-editor.c: Same general changes as above file.
        * gui/dialogs/meeting-page.c: Same general changes as above file.
        * gui/dialogs/schedule-page.c: Same general changes as above file.
        * gui/dialogs/task-details-page.c: Same general changes.
        * gui/dialogs/task-editor.c: Same general changes as above file.
        * gui/dialogs/task-page.c: Same general changes as above file.
        * gui/dialogs/e-delegate-dialog.c: Same general changes.

svn path=/trunk/; revision=19167

1 files changed, 9 insertions, 29 deletions

diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 2ed31b3be2..177c100b8b 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -91,7 +91,7 @@ static const int classification_map[] = {
 
 static void task_page_class_init (TaskPageClass *class);
 static void task_page_init (TaskPage *tpage);
-static void task_page_destroy (GtkObject *object);
+static void task_page_finalize (GObject *object);
 
 static GtkWidget *task_page_get_widget (CompEditorPage *page);
 static void task_page_focus_main_widget (CompEditorPage *page);
@@ -112,39 +112,19 @@ static CompEditorPageClass *parent_class = NULL;
  * 
  * Return value: The type ID of the #TaskPage class.
  **/
-GtkType
-task_page_get_type (void)
-{
-	static GtkType task_page_type;
-
-	if (!task_page_type) {
-		static const GtkTypeInfo task_page_info = {
-			"TaskPage",
-			sizeof (TaskPage),
-			sizeof (TaskPageClass),
-			(GtkClassInitFunc) task_page_class_init,
-			(GtkObjectInitFunc) task_page_init,
-			NULL, /* reserved_1 */
-			NULL, /* reserved_2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		task_page_type = gtk_type_unique (TYPE_COMP_EDITOR_PAGE,
-						  &task_page_info);
-	}
 
-	return task_page_type;
-}
+E_MAKE_TYPE (task_page, "TaskPage", TaskPage, task_page_class_init, task_page_init,
+	     TYPE_COMP_EDITOR_PAGE);
 
 /* Class initialization function for the task page */
 static void
 task_page_class_init (TaskPageClass *class)
 {
 	CompEditorPageClass *editor_page_class;
-	GtkObjectClass *object_class;
+	GObjectClass *object_class;
 
 	editor_page_class = (CompEditorPageClass *) class;
-	object_class = (GtkObjectClass *) class;
+	object_class = (GObjectClass *) class;
 
 	parent_class = g_type_class_ref(TYPE_COMP_EDITOR_PAGE);
 
@@ -155,7 +135,7 @@ task_page_class_init (TaskPageClass *class)
 	editor_page_class->set_summary = task_page_set_summary;
 	editor_page_class->set_dates = task_page_set_dates;
 
-	object_class->destroy = task_page_destroy;
+	object_class->finalize = task_page_finalize;
 }
 
 /* Object initialization function for the task page */
@@ -192,7 +172,7 @@ task_page_init (TaskPage *tpage)
 
 /* Destroy handler for the task page */
 static void
-task_page_destroy (GtkObject *object)
+task_page_finalize (GObject *object)
 {
 	TaskPage *tpage;
 	TaskPagePrivate *priv;
@@ -219,8 +199,8 @@ task_page_destroy (GtkObject *object)
 	g_free (priv);
 	tpage->priv = NULL;
 
-	if (GTK_OBJECT_CLASS (parent_class)->destroy)
-		(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+	if (G_OBJECT_CLASS (parent_class)->finalize)
+		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }