fix the gnome-xml headers.

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

	* gui/widgets/gal-view-minicard.c: fix the gnome-xml headers.

	* gui/widgets/e-addressbook-view.c
	(e_addressbook_view_class_init): convert from gtk signals and args
	to GSignal and GObject properties.
	(e_addressbook_view_dispose): rename _destroy to this.
	(e_addressbook_view_set_property): rework _set_arg to this.
	(e_addressbook_view_get_property): rework _get_arg to this.
	(display_view): if we're here we need to choose a view, regardless
	of whether or not the GAL_IS_VIEW_* macros tell us which type it
	is.

	* gui/widgets/e-addressbook-table-adapter.c: fix the gnome-xml
	headers.

	* gui/widgets/e-addressbook-model.c
	(e_addressbook_model_class_init): use INT, not ENUM in the signal here.

	* gui/component/addressbook-config.c: another big gtk_* -> g_*
	renaming.

	* gui/component/addressbook.c: same.

	* gui/component/e-address-popup.c: same.

	* gui/component/e-address-widget.c: same.

	* gui/component/e-cardlist-model.c: fix the gnome-xml headers, and
	more gtk_* -> g_* renaming.

	* gui/component/addressbook-component.c (owner_set_cb): use
	evolution_shell_client_corba_objref as per ettore's change to
	EvolutionShellClient..
	(create_view): fix the call to bonobo_control_set_property.
	(create_component): gtk_signal_connect -> g_signal_connect.

	* gui/component/addressbook-storage.c: fix the gnome-xml
	headers.
	(addressbook_storage_setup): use
	evolution_shell_client_corba_objref as per ettore's change to
	EvolutionShellClient..
	(addressbook_get_other_contact_storage): gtk_signal_connect ->
	g_signal_connect.
	(load_source_data): root->childs -> root->childrens.

svn path=/trunk/; revision=18598

1 files changed, 13 insertions, 13 deletions

diff --git a/addressbook/gui/component/e-cardlist-model.c b/addressbook/gui/component/e-cardlist-model.c
index 5d9b053934..2066d058bf 100644
--- a/addressbook/gui/component/e-cardlist-model.c
+++ b/addressbook/gui/component/e-cardlist-model.c
@@ -8,9 +8,9 @@
  */
 
 #include <config.h>
-#include <gnome-xml/tree.h>
-#include <gnome-xml/parser.h>
-#include <gnome-xml/xmlmemory.h>
+#include <libxml/tree.h>
+#include <libxml/parser.h>
+#include <libxml/xmlmemory.h>
 #include "e-cardlist-model.h"
 
 #define PARENT_TYPE e_table_model_get_type()
@@ -22,7 +22,7 @@ e_cardlist_model_destroy(GtkObject *object)
 	int i;
 
 	for ( i = 0; i < model->data_count; i++ ) {
-		gtk_object_unref(GTK_OBJECT(model->data[i]));
+		g_object_unref(model->data[i]);
 	}
 	g_free(model->data);
 }
@@ -67,9 +67,9 @@ e_cardlist_model_set_value_at (ETableModel *etc, int col, int row, const void *v
 	e_card_simple_set(e_cardlist_model->data[row],
 			  col + 1,
 			  val);
-	gtk_object_get(GTK_OBJECT(e_cardlist_model->data[row]),
-		       "card", &card,
-		       NULL);
+	g_object_get(e_cardlist_model->data[row],
+		     "card", &card,
+		     NULL);
 
 	e_table_model_cell_changed(etc, col, row);
 }
@@ -131,7 +131,7 @@ e_cardlist_model_add(ECardlistModel *model,
 		}
 		if (!found) {
 			e_table_model_pre_change(E_TABLE_MODEL(model));
-			gtk_object_ref(GTK_OBJECT(cards[i]));
+			g_object_ref(cards[i]);
 			model->data[model->data_count++] = e_card_simple_new (cards[i]);
 			e_table_model_row_inserted(E_TABLE_MODEL(model), model->data_count - 1);
 		}
@@ -146,7 +146,7 @@ e_cardlist_model_remove(ECardlistModel *model,
 	for ( i = 0; i < model->data_count; i++) {
 		if ( !strcmp(e_card_simple_get_id(model->data[i]), id) ) {
 			e_table_model_pre_change(E_TABLE_MODEL(model));
-			gtk_object_unref(GTK_OBJECT(model->data[i]));
+			g_object_unref(model->data[i]);
 			memmove(model->data + i, model->data + i + 1, (model->data_count - i - 1) * sizeof (ECard *));
 			e_table_model_row_deleted(E_TABLE_MODEL(model), i);
 		}
@@ -186,10 +186,10 @@ e_cardlist_model_get(ECardlistModel *model,
 {
 	if (model->data && row < model->data_count) {
 		ECard *card;
-		gtk_object_get(GTK_OBJECT(model->data[row]),
-			       "card", &card,
-			       NULL);
-		gtk_object_ref(GTK_OBJECT(card));
+		g_object_get(model->data[row],
+			     "card", &card,
+			     NULL);
+		g_object_ref(card);
 		return card;
 	}
 	return NULL;