From 4d0c841a0368793bee8b0d5a17ead69b3093b30b Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@novell.com>
Date: Thu, 14 Oct 2004 14:22:12 +0000
Subject: conver to G_DEFINE_TYPE

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

	* gui/dialogs/comp-editor.c: conver to G_DEFINE_TYPE

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

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

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

	* gui/dialogs/e-delegate-dialog.c: ditto

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

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

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

	* gui/dialogs/select-source-dialog.c
	(primary_selection_changed_cb): fix warning

svn path=/trunk/; revision=27576
---
 calendar/gui/dialogs/e-delegate-dialog.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'calendar/gui/dialogs/e-delegate-dialog.c')

diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index ff27699011..6ca0574a11 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -19,7 +19,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <bonobo-activation/bonobo-activation.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-exception.h>
@@ -31,7 +34,6 @@
 #include <gnome.h>
 #include <libical/ical.h>
 #include <glade/glade.h>
-#include <gal/util/e-util.h>
 #include <widgets/misc/e-map.h>
 #include <addressbook/util/e-destination.h>
 #include "Evolution-Addressbook-SelectNames.h"
@@ -56,17 +58,12 @@ struct _EDelegateDialogPrivate {
 #define SELECT_NAMES_OAFID "OAFIID:GNOME_Evolution_Addressbook_SelectNames:" BASE_VERSION
 static const char *section_name = "Delegate To";
 
-static void e_delegate_dialog_class_init	(EDelegateDialogClass *class);
-static void e_delegate_dialog_init		(EDelegateDialog      *edd);
 static void e_delegate_dialog_finalize		(GObject	*object);
 
 static gboolean get_widgets			(EDelegateDialog *edd);
 static void addressbook_clicked_cb              (GtkWidget *widget, gpointer data);
 
-static GtkObjectClass *parent_class;
-
-E_MAKE_TYPE (e_delegate_dialog, "EDelegateDialog", EDelegateDialog, e_delegate_dialog_class_init,
-	     e_delegate_dialog_init, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EDelegateDialog, e_delegate_dialog, G_TYPE_OBJECT);
 
 /* Class initialization function for the event editor */
 static void
@@ -76,8 +73,6 @@ e_delegate_dialog_class_init (EDelegateDialogClass *class)
 
 	gobject_class = (GObjectClass *) class;
 
-	parent_class = g_type_class_ref (G_TYPE_OBJECT);
-
 	gobject_class->finalize = e_delegate_dialog_finalize;
 }
 
@@ -117,8 +112,8 @@ e_delegate_dialog_finalize (GObject *object)
 	g_free (priv);
 	edd->priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	if (G_OBJECT_CLASS (e_delegate_dialog_parent_class)->finalize)
+		(* G_OBJECT_CLASS (e_delegate_dialog_parent_class)->finalize) (object);
 }
 
 
-- 
cgit v1.2.3