port to gnome 2.

2002-11-05  Chris Toshok  <toshok@ximian.com>

	* backend/pas/pas-backend-card-sexp.[ch]: port to gnome 2.

	* backend/pas/pas-backend-file.[ch]: same.

	* backend/pas/pas-backend-file.[ch]: same.

	* backend/pas/pas-backend-ldap.[ch]: same.

	* backend/pas/pas-backend-summary.[ch]: same.

	* backend/pas/pas-backend.[ch]: same.

	* backend/pas/pas-book-factory.[ch]: same.

	* backend/pas/pas-book-view.[ch]: same.

	* backend/pas/pas-book.[ch]: same.

	* backend/pas/pas-card-cursor.[ch]: same.

	* backend/pas/pas-marshal.list: list of marshallers.

	* backend/pas/Makefile.am (libpas_a_SOURCES): add pas-marshal.c
	also add the marshal building foo.

	* backend/pas/.cvsignore: ignore pas-marshal.[ch]

svn path=/trunk/; revision=18544

1 files changed, 88 insertions, 89 deletions

diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 00dc5df4a2..f7442cdf2d 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -10,10 +10,7 @@
 
 #include "config.h"  
 #include <fcntl.h>
-#include <gtk/gtksignal.h>
-
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-i18n.h>
+#include <string.h>
 
 #ifdef DEBUG
 #define LDAP_DEBUG
@@ -38,6 +35,7 @@
 
 #include <e-util/e-sexp.h>
 #include <ebook/e-card-simple.h>
+#include <libgnome/gnome-i18n.h>
 
 #include "pas-backend-ldap.h"
 #include "pas-backend-card-sexp.h"
@@ -293,7 +291,7 @@ remove_view (int msgid, LDAPOp *op, PASBookView *view)
 }
 
 static void
-view_destroy(GtkObject *object, gpointer data)
+view_destroy(GObject *object, gpointer data)
 {
 	PASBook           *book = (PASBook *)data;
 	PASBackendLDAP    *bl;
@@ -321,7 +319,7 @@ view_destroy(GtkObject *object, gpointer data)
 
 			/* free up the view structure */
 			g_free (view->search);
-			gtk_object_unref (GTK_OBJECT (view->card_sexp));
+			g_object_unref (view->card_sexp);
 			g_free (view);
 
 			/* and remove it from our list */
@@ -346,7 +344,7 @@ view_destroy(GtkObject *object, gpointer data)
 		e_iterator_next (iter);
 	}
 
-	gtk_object_unref (GTK_OBJECT (iter));
+	g_object_unref (iter);
 
 }
 
@@ -371,7 +369,7 @@ find_book_view (PASBackendLDAP *bl)
 			rv = v->book_view;
 	}
 
-	gtk_object_unref (GTK_OBJECT (iter));
+	g_object_unref (iter);
 
 	return rv;
 }
@@ -1106,7 +1104,7 @@ create_card_handler (LDAPOp *op, LDAPMessage *res)
 
 			e_iterator_next (iter);
 		}
-		gtk_object_unref (GTK_OBJECT (iter));
+		g_object_unref (iter);
 	}
 	else {
 		ldap_perror (ldap, "create_card");
@@ -1130,7 +1128,7 @@ create_card_dtor (LDAPOp *op)
 	LDAPCreateOp *create_op = (LDAPCreateOp*)op;
 
 	g_free (create_op->dn);
-	gtk_object_unref (GTK_OBJECT (create_op->new_card));
+	g_object_unref (create_op->new_card);
 	g_free (create_op);
 }
 
@@ -1174,7 +1172,7 @@ pas_backend_ldap_process_create_card (PASBackend *backend,
 					 create_op->dn);
 
 		g_free (create_op->dn);
-		gtk_object_unref (GTK_OBJECT(create_op->new_card));
+		g_object_unref (create_op->new_card);
 		g_free (create_op);
 		return;
 	}
@@ -1295,7 +1293,7 @@ remove_card_handler (LDAPOp *op, LDAPMessage *res)
 
 			e_iterator_next (iter);
 		}
-		gtk_object_unref (GTK_OBJECT (iter));
+		g_object_unref (iter);
 	}
 	else {
 		ldap_perror (bl->priv->ldap, "remove_card");
@@ -1423,7 +1421,7 @@ modify_card_modify_handler (LDAPOp *op, LDAPMessage *res)
 
 			e_iterator_next (iter);
 		}
-		gtk_object_unref (GTK_OBJECT (iter));
+		g_object_unref (iter);
 	}
 	else {
 		ldap_perror (ldap, "ldap_modify_s");
@@ -1539,10 +1537,10 @@ modify_card_dtor (LDAPOp *op)
 	g_list_free (modify_op->existing_objectclasses);
 	g_free (modify_op->current_vcard);
 	if (modify_op->current_card)
-		gtk_object_unref (GTK_OBJECT (modify_op->current_card));
+		g_object_unref (modify_op->current_card);
 	g_free (modify_op->vcard);
 	if (modify_op->card)
-		gtk_object_unref (GTK_OBJECT (modify_op->card));
+		g_object_unref (modify_op->card);
 	g_free (modify_op);
 }
 
@@ -1564,7 +1562,7 @@ pas_backend_ldap_process_modify_card (PASBackend *backend,
 	modify_op->vcard = g_strdup (req->modify.vcard);
 	new_ecard = e_card_new (modify_op->vcard);
 	modify_op->card = e_card_simple_new (new_ecard);
-	gtk_object_unref (GTK_OBJECT (new_ecard));
+	g_object_unref (new_ecard);
 	modify_op->id = e_card_simple_get_id(modify_op->card);
 
 	ldap = bl->priv->ldap;
@@ -1631,7 +1629,7 @@ get_vcard_handler (LDAPOp *op, LDAPMessage *res)
 					    GNOME_Evolution_Addressbook_BookListener_Success,
 					    vcard);
 		g_free (vcard);
-		gtk_object_unref (GTK_OBJECT (simple));
+		g_object_unref (simple);
 		ldap_op_finished (op);
 	}
 	else if (msg_type == LDAP_RES_SEARCH_RESULT) {
@@ -1720,7 +1718,7 @@ get_nth(PASCardCursor *cursor, long n, gpointer data)
 }
 
 static void
-cursor_destroy(GtkObject *object, gpointer data)
+cursor_destroy(GObject *object, gpointer data)
 {
 	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;
 
@@ -1771,7 +1769,7 @@ get_cursor_handler (LDAPOp *op, LDAPMessage *res)
 				cursor_op->cursor_data->num_elements ++;
 				cursor_op->cursor_data->elements = g_list_prepend (cursor_op->cursor_data->elements,
 										   vcard);
-				gtk_object_unref (GTK_OBJECT (simple));
+				g_object_unref (simple);
 			}
 		}
 	}
@@ -1786,8 +1784,8 @@ get_cursor_handler (LDAPOp *op, LDAPMessage *res)
 						     get_nth,
 						     cursor_op->cursor_data);
 
-			gtk_signal_connect(GTK_OBJECT(cursor), "destroy",
-					   GTK_SIGNAL_FUNC(cursor_destroy), cursor_op->cursor_data);
+			g_signal_connect(cursor, "destroy",
+					 G_CALLBACK(cursor_destroy), cursor_op->cursor_data);
 
 			cursor_op->responded = TRUE;
 		}
@@ -2089,9 +2087,9 @@ anniversary_populate (ECardSimple *card, char **values)
 {
 	if (values[0]) {
 		ECardDate dt = e_card_date_from_string (values[0]);
-		gtk_object_set (GTK_OBJECT (card->card),
-				"anniversary", &dt,
-				NULL);
+		g_object_set (card->card,
+			      "anniversary", &dt,
+			      NULL);
 	}
 }
 
@@ -2101,9 +2099,9 @@ anniversary_ber (ECardSimple *card)
 	ECardDate *dt;
 	struct berval** result = NULL;
 
-	gtk_object_get (GTK_OBJECT (card->card),
-			"anniversary", &dt,
-			NULL);
+	g_object_get (card->card,
+		      "anniversary", &dt,
+		      NULL);
 
 	if (dt) {
 		char *anniversary;
@@ -2128,15 +2126,15 @@ anniversary_compare (ECardSimple *ecard1, ECardSimple *ecard2)
 	char *date1 = NULL, *date2 = NULL;
 	gboolean equal;
 
-	gtk_object_get (GTK_OBJECT (ecard1->card),
-			"anniversary", &dt,
-			NULL);
+	g_object_get (ecard1->card,
+		      "anniversary", &dt,
+		      NULL);
 	if (dt)
 		date1 = e_card_date_to_string (dt);
 
-	gtk_object_get (GTK_OBJECT (ecard2->card),
-			"anniversary", &dt,
-			NULL);
+	g_object_get (ecard2->card,
+		      "anniversary", &dt,
+		      NULL);
 	if (dt)
 		date2 = e_card_date_to_string (dt);
 
@@ -2156,9 +2154,9 @@ birthday_populate (ECardSimple *card, char **values)
 {
 	if (values[0]) {
 		ECardDate dt = e_card_date_from_string (values[0]);
-		gtk_object_set (GTK_OBJECT (card->card),
-				"birth_date", &dt,
-				NULL);
+		g_object_set (card->card,
+			      "birth_date", &dt,
+			      NULL);
 	}
 }
 
@@ -2168,9 +2166,9 @@ birthday_ber (ECardSimple *card)
 	ECardDate *dt;
 	struct berval** result = NULL;
 
-	gtk_object_get (GTK_OBJECT (card->card),
-			"birth_date", &dt,
-			NULL);
+	g_object_get (card->card,
+		      "birth_date", &dt,
+		      NULL);
 
 	if (dt) {
 		char *birthday;
@@ -2195,15 +2193,15 @@ birthday_compare (ECardSimple *ecard1, ECardSimple *ecard2)
 	char *date1 = NULL, *date2 = NULL;
 	gboolean equal;
 
-	gtk_object_get (GTK_OBJECT (ecard1->card),
-			"birth_date", &dt,
-			NULL);
+	g_object_get (ecard1->card,
+		      "birth_date", &dt,
+		      NULL);
 	if (dt)
 		date1 = e_card_date_to_string (dt);
 
-	gtk_object_get (GTK_OBJECT (ecard2->card),
-			"birth_date", &dt,
-			NULL);
+	g_object_get (ecard2->card,
+		      "birth_date", &dt,
+		      NULL);
 	if (dt)
 		date2 = e_card_date_to_string (dt);
 
@@ -2225,9 +2223,9 @@ category_populate (ECardSimple *card, char **values)
 	ECard *ecard;
 	EList *categories;
 
-	gtk_object_get (GTK_OBJECT (card),
-			"card", &ecard,
-			NULL);
+	g_object_get (card,
+		      "card", &ecard,
+		      NULL);
 
 	categories = e_list_new((EListCopyFunc) g_strdup, 
 				(EListFreeFunc) g_free,
@@ -2236,11 +2234,11 @@ category_populate (ECardSimple *card, char **values)
 	for (i = 0; values[i]; i++)
 		e_list_append (categories, values[i]);
 
-	gtk_object_set (GTK_OBJECT (ecard),
-			"category_list", categories,
-			NULL);
+	g_object_set (ecard,
+		      "category_list", categories,
+		      NULL);
 
-	gtk_object_unref (GTK_OBJECT (categories));
+	g_object_unref (categories);
 
 	e_card_simple_sync_card (card);
 }
@@ -2254,13 +2252,13 @@ category_ber (ECardSimple *card)
 	ECard *ecard;
 	int i;
 
-	gtk_object_get (GTK_OBJECT (card),
-			"card", &ecard,
-			NULL);
+	g_object_get (card,
+		      "card", &ecard,
+		      NULL);
 
-	gtk_object_get (GTK_OBJECT (ecard),
-			"category_list", &categories,
-			NULL);
+	g_object_get (ecard,
+		      "category_list", &categories,
+		      NULL);
 
 	if (e_list_length (categories) != 0) {
 		result = g_new0 (struct berval*, e_list_length (categories) + 1);
@@ -2274,7 +2272,7 @@ category_ber (ECardSimple *card)
 			result[i]->bv_len = strlen (category);
 		}
 
-		gtk_object_unref (GTK_OBJECT (iterator));
+		g_object_unref (iterator);
 	}
 
 	return result;
@@ -2740,7 +2738,7 @@ build_card_from_entry (LDAP *ldap, LDAPMessage *e, GList **existing_objectclasse
 					}
 					else if (info->prop_type & PROP_TYPE_COMPLEX) {
 						/* if it's a list call the ecard-populate function,
-						   which calls gtk_object_set to set the property */
+						   which calls g_object_set to set the property */
 						info->populate_ecard_func(card,
 									  values);
 					}
@@ -2758,7 +2756,7 @@ build_card_from_entry (LDAP *ldap, LDAPMessage *e, GList **existing_objectclasse
 
 	e_card_simple_sync_card (card);
 
-	gtk_object_unref (GTK_OBJECT (ecard));
+	g_object_unref (ecard);
 
 	return card;
 }
@@ -2824,7 +2822,7 @@ poll_ldap (PASBackendLDAP *bl)
 		}
 		e_iterator_next (iter);
 	}
-	gtk_object_unref (GTK_OBJECT (iter));
+	g_object_unref (iter);
 
 	return TRUE;
 }
@@ -2900,7 +2898,7 @@ ldap_search_handler (LDAPOp *op, LDAPMessage *res)
 								 e_card_simple_get_vcard_assume_utf8 (card));
 			search_op->num_pending_adds ++;
 
-			gtk_object_unref (GTK_OBJECT(card));
+			g_object_unref (card);
 
 			e = ldap_next_entry(ldap, e);
 		}
@@ -3039,8 +3037,8 @@ pas_backend_ldap_process_get_book_view (PASBackend *backend,
 	book_view = pas_book_view_new (req->get_book_view.listener);
 
 	bonobo_object_ref(BONOBO_OBJECT(book));
-	gtk_signal_connect(GTK_OBJECT(book_view), "destroy",
-			   GTK_SIGNAL_FUNC(view_destroy), book);
+	g_signal_connect(book_view, "destroy",
+			 G_CALLBACK (view_destroy), book);
 
 	view = g_new0(PASBackendLDAPBookView, 1);
 	view->book_view = book_view;
@@ -3336,11 +3334,11 @@ pas_backend_ldap_add_client (PASBackend             *backend,
 		return FALSE;
 	}
 
-	gtk_signal_connect (GTK_OBJECT (book), "destroy",
-		    pas_backend_ldap_book_destroy_cb, backend);
+	g_signal_connect (book, "destroy",
+			  G_CALLBACK (pas_backend_ldap_book_destroy_cb), backend);
 
-	gtk_signal_connect (GTK_OBJECT (book), "requests_queued",
-		    pas_backend_ldap_process_client_requests, NULL);
+	g_signal_connect (book, "requests_queued",
+			  G_CALLBACK (pas_backend_ldap_process_client_requests), NULL);
 
 	bl->priv->clients = g_list_prepend (
 		bl->priv->clients, book);
@@ -3409,10 +3407,10 @@ pas_backend_ldap_new (void)
 {
 	PASBackendLDAP *backend;
 
-	backend = gtk_type_new (pas_backend_ldap_get_type ());
+	backend = g_object_new (PAS_TYPE_BACKEND_LDAP, NULL);
 
 	if (! pas_backend_ldap_construct (backend)) {
-		gtk_object_unref (GTK_OBJECT (backend));
+		g_object_unref (backend);
 
 		return NULL;
 	}
@@ -3431,7 +3429,7 @@ call_dtor (int msgid, LDAPOp *op, gpointer data)
 }
 
 static void
-pas_backend_ldap_destroy (GtkObject *object)
+pas_backend_ldap_dispose (GObject *object)
 {
 	PASBackendLDAP *bl;
 
@@ -3445,26 +3443,26 @@ pas_backend_ldap_destroy (GtkObject *object)
 		g_source_remove (bl->priv->poll_timeout);
 	}
 
-	gtk_object_unref (GTK_OBJECT (bl->priv->book_views));
+	g_object_unref (bl->priv->book_views);
 
 	if (bl->priv->supported_fields)
-		gtk_object_unref (GTK_OBJECT (bl->priv->supported_fields));
+		g_object_unref (bl->priv->supported_fields);
 
 	g_free (bl->priv->uri);
 
-	GTK_OBJECT_CLASS (pas_backend_ldap_parent_class)->destroy (object);	
+	G_OBJECT_CLASS (pas_backend_ldap_parent_class)->dispose (object);	
 }
 
 static void
 pas_backend_ldap_class_init (PASBackendLDAPClass *klass)
 {
-	GtkObjectClass  *object_class = (GtkObjectClass *) klass;
+	GObjectClass  *object_class = G_OBJECT_CLASS (klass);
 	PASBackendClass *parent_class;
 
 	/* get client side information (extensions present in the library) */
 	get_ldap_library_info ();
 
-	pas_backend_ldap_parent_class = gtk_type_class (pas_backend_get_type ());
+	pas_backend_ldap_parent_class = g_type_class_ref (PAS_TYPE_BACKEND);
 
 	parent_class = PAS_BACKEND_CLASS (klass);
 
@@ -3475,7 +3473,7 @@ pas_backend_ldap_class_init (PASBackendLDAPClass *klass)
 	parent_class->remove_client           = pas_backend_ldap_remove_client;
 	parent_class->get_static_capabilities = pas_backend_ldap_get_static_capabilities;
 
-	object_class->destroy = pas_backend_ldap_destroy;
+	object_class->dispose = pas_backend_ldap_dispose;
 }
 
 static void
@@ -3497,24 +3495,25 @@ pas_backend_ldap_init (PASBackendLDAP *backend)
 /**
  * pas_backend_ldap_get_type:
  */
-GtkType
+GType
 pas_backend_ldap_get_type (void)
 {
-	static GtkType type = 0;
+	static GType type = 0;
 
 	if (! type) {
-		GtkTypeInfo info = {
-			"PASBackendLDAP",
-			sizeof (PASBackendLDAP),
+		GTypeInfo info = {
 			sizeof (PASBackendLDAPClass),
-			(GtkClassInitFunc)  pas_backend_ldap_class_init,
-			(GtkObjectInitFunc) pas_backend_ldap_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
+			NULL, /* base_class_init */
+			NULL, /* base_class_finalize */
+			(GClassInitFunc)  pas_backend_ldap_class_init,
+			NULL, /* class_finalize */
+			NULL, /* class_data */
+			sizeof (PASBackendLDAP),
+			0,    /* n_preallocs */
+			(GInstanceInitFunc) pas_backend_ldap_init
 		};
 
-		type = gtk_type_unique (pas_backend_get_type (), &info);
+		type = g_type_register_static (PAS_TYPE_BACKEND, "PASBackendLDAP", &info, 0);
 	}
 
 	return type;