Merge with camel-async.

svn path=/trunk/; revision=4687

1 files changed, 16 insertions, 35 deletions

diff --git a/camel/camel-news-address.c b/camel/camel-news-address.c
index 671f0a5559..ebd35b80c7 100644
--- a/camel/camel-news-address.c
+++ b/camel/camel-news-address.c
@@ -22,53 +22,34 @@
 
 
 static void camel_news_address_class_init (CamelNewsAddressClass *klass);
-static void camel_news_address_init       (CamelNewsAddress *obj);
 
 static CamelAddressClass *camel_news_address_parent;
 
-enum SIGNALS {
-	LAST_SIGNAL
-};
+static void
+camel_news_address_class_init (CamelNewsAddressClass *klass)
+{
+	camel_news_address_parent = CAMEL_ADDRESS_CLASS (camel_type_get_global_classfuncs (camel_address_get_type ()));
+}
 
-static guint signals[LAST_SIGNAL] = { 0 };
 
-guint
+CamelType
 camel_news_address_get_type (void)
 {
-	static guint type = 0;
+	static guint type = CAMEL_INVALID_TYPE;
 	
-	if (!type) {
-		GtkTypeInfo type_info = {
-			"CamelNewsAddress",
-			sizeof (CamelNewsAddress),
-			sizeof (CamelNewsAddressClass),
-			(GtkClassInitFunc) camel_news_address_class_init,
-			(GtkObjectInitFunc) camel_news_address_init,
-			(GtkArgSetFunc) NULL,
-			(GtkArgGetFunc) NULL
-		};
-		
-		type = gtk_type_unique (camel_address_get_type (), &type_info);
+	if (type == CAMEL_INVALID_TYPE) {
+		type = camel_type_register (camel_address_get_type (), "CamelNewsAddress",
+					    sizeof (CamelNewsAddress),
+					    sizeof (CamelNewsAddressClass),
+					    (CamelObjectClassInitFunc) camel_news_address_class_init,
+					    NULL,
+					    NULL,
+					    NULL);
 	}
 	
 	return type;
 }
 
-static void
-camel_news_address_class_init (CamelNewsAddressClass *klass)
-{
-	GtkObjectClass *object_class = (GtkObjectClass *) klass;
-	
-	camel_news_address_parent = gtk_type_class (camel_address_get_type ());
-
-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-}
-
-static void
-camel_news_address_init (CamelNewsAddress *obj)
-{
-}
-
 /**
  * camel_news_address_new:
  *
@@ -79,6 +60,6 @@ camel_news_address_init (CamelNewsAddress *obj)
 CamelNewsAddress *
 camel_news_address_new (void)
 {
-	CamelNewsAddress *new = CAMEL_NEWS_ADDRESS ( gtk_type_new (camel_news_address_get_type ()));
+	CamelNewsAddress *new = CAMEL_NEWS_ADDRESS ( camel_object_new (camel_news_address_get_type ()));
 	return new;
 }