test prog

2004-11-26  JP Rosevear  <jpr@novell.com>

	* test-info-label.c: test prog

	* e-url-entry.c: get image directly from icon factory

	* e-combo-button.c: ditto; convert to G_DEFINE_TYPE

	* e-activity-handler.c: convert to G_DEFINE_TYPE

	* e-task-widget.c: ditto

	* e-task-bar.c: ditto

	* e-multi-config-dialog.c: ditto

	* e-dropdown-button.c: ditto

	* e-cell-renderer-combo.c: ditto

	* e-cell-date-edit.c: ditto

	* e-calendar.c: ditto

	* e-calendar-item.c: ditto

	* Makefile.am: don't build the title bar, build an info label test
	program

svn path=/trunk/; revision=27999

1 files changed, 5 insertions, 11 deletions

diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c
index 71b9457e7d..499ef97554 100644
--- a/widgets/misc/e-multi-config-dialog.c
+++ b/widgets/misc/e-multi-config-dialog.c
@@ -37,12 +37,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 
-#define PARENT_TYPE gtk_dialog_get_type ()
-static GtkDialogClass *parent_class = NULL;
-
 #define SWITCH_PAGE_INTERVAL 250
 
-
 struct _EMultiConfigDialogPrivate {
 	GSList *pages;
 	
@@ -55,6 +51,8 @@ struct _EMultiConfigDialogPrivate {
 	int set_page_timeout_page;
 };
 
+G_DEFINE_TYPE (EMultiConfigDialog, e_multi_config_dialog, GTK_TYPE_DIALOG)
+
 
 /* ETable stuff.  */
 
@@ -177,7 +175,7 @@ impl_finalize (GObject *object)
 
 	g_free (priv);
 
-	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	(* G_OBJECT_CLASS (e_multi_config_dialog_parent_class)->finalize) (object);
 }
 
 
@@ -216,7 +214,7 @@ impl_response (GtkDialog *dialog, int response_id)
 /* GObject ctors.  */
 
 static void
-class_init (EMultiConfigDialogClass *class)
+e_multi_config_dialog_class_init (EMultiConfigDialogClass *class)
 {
 	GObjectClass *object_class;
 	GtkDialogClass *dialog_class;
@@ -226,8 +224,6 @@ class_init (EMultiConfigDialogClass *class)
 
 	dialog_class = GTK_DIALOG_CLASS (class);
 	dialog_class->response = impl_response;
-
-	parent_class = g_type_class_ref (PARENT_TYPE);
 }
 
 #define RGB_COLOR(color) (((color).red & 0xff00) << 8 | \
@@ -287,7 +283,7 @@ static ETableMemoryStoreColumnInfo columns[] = {
 };
 
 static void
-init (EMultiConfigDialog *multi_config_dialog)
+e_multi_config_dialog_init (EMultiConfigDialog *multi_config_dialog)
 {
 	EMultiConfigDialogPrivate *priv;
 	ETableModel *list_e_table_model;
@@ -449,5 +445,3 @@ e_multi_config_dialog_show_page (EMultiConfigDialog *dialog, int page)
 	gtk_notebook_set_page (GTK_NOTEBOOK (priv->notebook), page);
 }
 
-
-E_MAKE_TYPE (e_multi_config_dialog, "EMultiConfigDialog", EMultiConfigDialog, class_init, init, PARENT_TYPE)